This commit was manufactured by cvs2svn to create branch 'SAMBA_3_0'.(This used to...

[kai/samba.git] / packaging / RedHat / makerpms.sh.tmpl

diff --git a/packaging/RedHat/makerpms.sh.tmpl b/packaging/RedHat/makerpms.sh.tmpl
index 4b01e13df36edb63754a8ecc4fbad3909f643e6b..3c4ff40ddc853575625241f06c3ef68f247cbd6c 100644 (file)
--- a/packaging/RedHat/makerpms.sh.tmpl
+++ b/packaging/RedHat/makerpms.sh.tmpl
@@ -12,9 +12,9 @@
 # Note: Under this directory rpm expects to find the same directories that are under the
 #   /usr/src/redhat directory
 #
-if [ -x ~/.rpmmacros ]; then
+if [ -r ~/.rpmmacros ]; then
        TOPDIR=`awk '/topdir/ {print $2}' < ~/.rpmmacros`
-       if [ z$TOPDIR <> "z" ]; then
+       if [ z$TOPDIR != "z" ]; then
                SPECDIR=${TOPDIR}/SPECS
                SRCDIR=${TOPDIR}/SOURCES
        fi
@@ -37,23 +37,19 @@ case $RPMVER in
     2*)
        echo Building for RPM v2.x
        sed -e "s/MANDIR_MACRO/\%\{prefix\}\/man/g" < samba2.spec > samba.spec
-       sed -e "s/MANDIR_MACRO/\%\{prefix\}\/man/g" < samba2-devel.spec > samba-devel.spec
        ;;
     3*)
        echo Building for RPM v3.x
        sed -e "s/MANDIR_MACRO/\%\{prefix\}\/man/g" < samba2.spec > samba.spec
-       sed -e "s/MANDIR_MACRO/\%\{prefix\}\/man/g" < samba2-devel.spec > samba-devel.spec
        ;;
     4.1*)
        echo Building for RPM v4.1
        RPM="rpmbuild"
        sed -e "s/MANDIR_MACRO/\%\{_mandir\}/g" < samba2.spec > samba.spec
-       sed -e "s/MANDIR_MACRO/\%\{_mandir\}/g" < samba2-devel.spec > samba-devel.spec
        ;;
     4*)
        echo Building for RPM v4.x
        sed -e "s/MANDIR_MACRO/\%\{_mandir\}/g" < samba2.spec > samba.spec
-       sed -e "s/MANDIR_MACRO/\%\{_mandir\}/g" < samba2-devel.spec > samba-devel.spec
        ;;
     *)
        echo "Unknown RPM version: `rpm --version`"
@@ -69,7 +65,7 @@ if [ z$1 = z"devel" ]; then
        (cd ../../.. ; mv samba samba-${VERSION} )
 fi
 
-( cd ../../.. ; tar --exclude=CVS -cf - samba-${VERSION} | bzip2 > ${SRCDIR}/samba-${VERSION}.tar.bz2 )
+( cd ../../.. ; tar --exclude=CVS -cf - samba-${VERSION}/. | bzip2 > ${SRCDIR}/samba-${VERSION}.tar.bz2 )
 
 cp -av samba.spec ${SPECDIR}
 cp -av samba-devel.spec ${SPECDIR}
@@ -79,11 +75,11 @@ if [ z$1 = "zdevel" ]; then
        ( cd ../../.. ; mv samba-${VERSION} samba )
        echo Getting Ready to build Developmental Build
        cd ${SPECDIR}
-       rpm -ba -v samba-devel.spec
+       ${RPM} -ba -v samba-devel.spec
 else
        echo Getting Ready to build release package
        cd ${SPECDIR}
-       rpm -ba -v --clean --rmsource samba.spec
+       ${RPM} -ba -v --clean --rmsource samba.spec
 fi
 
 echo Done.