r15165: updates for RH 9 packages (merged from RHEL fixes)

diff --git a/packaging/RedHat-9/makerpms.sh.tmpl b/packaging/RedHat-9/makerpms.sh.tmpl
index 8da4a5d520e85b56411fe60b65cc6a99ac77fd01..e54467f4931a66dce89efcc98328f224258d6fe5 100644 (file)
--- a/packaging/RedHat-9/makerpms.sh.tmpl
+++ b/packaging/RedHat-9/makerpms.sh.tmpl
@@ -21,6 +21,7 @@ SRCDIR=`rpm --eval %_sourcedir`
 USERID=`id -u`
 GRPID=`id -g`
 VERSION='PVERSION'
+REVISION='PREVISION'
 SPECFILE="samba3.spec"
 RPMVER=`rpm --version | awk '{print $3}'`
 RPM="rpm"
@@ -53,10 +54,29 @@ esac
 
 echo "RPM build command is \"$RPM\""
 
-( cd ../../source; if [ -f Makefile ]; then make distclean; fi )
-( cd ../../.. ; chown -R ${USERID}.${GRPID} samba-${VERSION} )
+pushd .
+cd ../../source
+if [ -f Makefile ]; then
+        make distclean
+fi
+popd
+
+pushd .
+cd ../../../
+chown -R ${USERID}.${GRPID} samba-${VERSION}${REVISION}
+if [ ! -d samba-${VERSION} ]; then
+        ln -s samba-${VERSION}${REVISION} samba-${VERSION} || exit 1
+fi
+echo -n "Creating samba-${VERSION}.tar.bz2 ... "
+tar --exclude=.svn -cf - samba-${VERSION}/. | bzip2 > ${SRCDIR}/samba-${VERSION}.tar.bz2
+echo "Done."
+if [ $? -ne 0 ]; then
+        echo "Build failed!"
+        exit 1
+fi
+
+popd
 
-( cd ../../.. ; tar --exclude=CVS -cf - samba-${VERSION}/. | bzip2 > ${SRCDIR}/samba-${VERSION}.tar.bz2 )
 
 /bin/cp -p filter-requires-samba_rh8.sh ${SRCDIR}
 /bin/cp -p filter-requires-samba_rh9.sh ${SRCDIR}

diff --git a/packaging/RedHat-9/samba.spec.tmpl b/packaging/RedHat-9/samba.spec.tmpl
index e450bf512fb2a9ca8499d9840368a9a15b55d1d8..927f8f2b1ba7da22c954fc0b3b2950e38cee027f 100644 (file)
--- a/packaging/RedHat-9/samba.spec.tmpl
+++ b/packaging/RedHat-9/samba.spec.tmpl
@@ -5,7 +5,7 @@ Summary: Samba SMB client and server
 Vendor: Samba Team
 Name: samba
 Version: PVERSION
-Release: PRELEASE
+Release: PRELEASEPRPMREV
 License: GNU GPL version 2
 Group: Networking
 Source: http://download.samba.org/samba/ftp/samba-%{version}.tar.bz2
@@ -449,10 +449,8 @@ fi
 %{prefix}/lib/libmsrpc.a
 %{prefix}/lib/libmsrpc.so
 %{prefix}/share/swat/help/*
-%{prefix}/share/swat/images/*.gif
 %{prefix}/share/swat/include/*.html
 %{prefix}/share/swat/lang/*/help/*
-%{prefix}/share/swat/lang/*/images/*.gif
 %config(noreplace) /etc/samba/lmhosts
 %config(noreplace) /etc/samba/smb.conf
 %config(noreplace) /etc/samba/smbusers