svn commit: samba r15165 - in
branches/SAMBA_3_0/packaging/RedHat-9: .
jerry at samba.org
jerry at samba.org
Sat Apr 22 21:43:32 GMT 2006
Author: jerry
Date: 2006-04-22 21:43:31 +0000 (Sat, 22 Apr 2006)
New Revision: 15165
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15165
Log:
updates for RH 9 packages (merged from RHEL fixes)
Modified:
branches/SAMBA_3_0/packaging/RedHat-9/makerpms.sh.tmpl
branches/SAMBA_3_0/packaging/RedHat-9/samba.spec.tmpl
Changeset:
Modified: branches/SAMBA_3_0/packaging/RedHat-9/makerpms.sh.tmpl
===================================================================
--- branches/SAMBA_3_0/packaging/RedHat-9/makerpms.sh.tmpl 2006-04-22 20:52:54 UTC (rev 15164)
+++ branches/SAMBA_3_0/packaging/RedHat-9/makerpms.sh.tmpl 2006-04-22 21:43:31 UTC (rev 15165)
@@ -21,6 +21,7 @@
USERID=`id -u`
GRPID=`id -g`
VERSION='PVERSION'
+REVISION='PREVISION'
SPECFILE="samba3.spec"
RPMVER=`rpm --version | awk '{print $3}'`
RPM="rpm"
@@ -53,11 +54,30 @@
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
-( cd ../../.. ; tar --exclude=CVS -cf - samba-${VERSION}/. | bzip2 > ${SRCDIR}/samba-${VERSION}.tar.bz2 )
+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
+
+
/bin/cp -p filter-requires-samba_rh8.sh ${SRCDIR}
/bin/cp -p filter-requires-samba_rh9.sh ${SRCDIR}
chmod 755 ${SRCDIR}/filter-requires-samba_rh?.sh
Modified: branches/SAMBA_3_0/packaging/RedHat-9/samba.spec.tmpl
===================================================================
--- branches/SAMBA_3_0/packaging/RedHat-9/samba.spec.tmpl 2006-04-22 20:52:54 UTC (rev 15164)
+++ branches/SAMBA_3_0/packaging/RedHat-9/samba.spec.tmpl 2006-04-22 21:43:31 UTC (rev 15165)
@@ -5,7 +5,7 @@
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 @@
%{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
More information about the samba-cvs
mailing list