From 75ac8c17c0e5d2624fc9db82d1b501f906cbfa39 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 22 Aug 2003 16:53:17 +0000
Subject: [PATCH] fixing some packaging stuff for Solaris (This used to be
 commit b0d3f40ffe666f768f5ec0d93b84488148b5527e)

---
 packaging/Solaris/{makepkg.sh => makepkg.sh.tmpl} |  2 +-
 packaging/bin/update-pkginfo                      | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)
 rename packaging/Solaris/{makepkg.sh => makepkg.sh.tmpl} (98%)

diff --git a/packaging/Solaris/makepkg.sh b/packaging/Solaris/makepkg.sh.tmpl
similarity index 98%
rename from packaging/Solaris/makepkg.sh
rename to packaging/Solaris/makepkg.sh.tmpl
index 8423a1a9b49..55a2da2c6a0 100755
--- a/packaging/Solaris/makepkg.sh
+++ b/packaging/Solaris/makepkg.sh.tmpl
@@ -144,7 +144,7 @@ if [ -f prototype ]; then
 fi
 
 # Setup version from version.h
-VERSION=`sed 's/#define VERSION \"\(.*\)\"$/\1/' ../../source/include/version.h`
+VERSION=PVERSION
 sed -e "s|__VERSION__|$VERSION|" -e "s|__ARCH__|`uname -p`|" -e "s|__BASEDIR__|$INSTALL_BASE|g" pkginfo.master >pkginfo
 
 sed -e "s|__BASEDIR__|$INSTALL_BASE|g" inetd.conf.master >inetd.conf
diff --git a/packaging/bin/update-pkginfo b/packaging/bin/update-pkginfo
index 8432173cc88..47f3c3c306b 100755
--- a/packaging/bin/update-pkginfo
+++ b/packaging/bin/update-pkginfo
@@ -8,13 +8,9 @@ if [ $# -ne 2 ]; then
     exit 1
 fi
 
-for f in */*/*.tmpl; do
-	f2=`echo $f | sed s/.tmpl//g`
-	echo $f2
-	sed -e s/PVERSION/$VERSION/g -e s/PRELEASE/$RELEASE/g < $f > $f2
-done
-for f in */*.tmpl; do
-	f2=`echo $f | sed s/.tmpl//g`
-	echo $f2
-	sed -e s/PVERSION/$VERSION/g -e s/PRELEASE/$RELEASE/g < $f > $f2
+for f in `du -a | awk '{print $2}' | grep \.tmpl$`; do
+        f2=`echo $f | sed s/.tmpl//g`
+        echo $f2
+        sed -e s/PVERSION/$VERSION/g -e s/PRELEASE/$RELEASE/g < $f > $f2
 done
+