remove 'devel' option to makerpms.sh.tmpl since we don't use it n the RH packaging...

(This used to be commit bfcdd769f5fd008bf8113c4fe82c3791bd354398)

diff --git a/packaging/RedHat/makerpms.sh.tmpl b/packaging/RedHat/makerpms.sh.tmpl
index 3c4ff40ddc853575625241f06c3ef68f247cbd6c..ee5ebd50400d50eb0877d26efc0f1e00a1cdc3ad 100644 (file)
--- a/packaging/RedHat/makerpms.sh.tmpl
+++ b/packaging/RedHat/makerpms.sh.tmpl
@@ -60,27 +60,13 @@ esac
 ( cd ../../source; if [ -f Makefile ]; then make distclean; fi )
 ( cd ../../.. ; chown -R ${USERID}.${GRPID} samba-${VERSION} )
 
-# We do this to make sure that the package always has the current version in it''s name
-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 )
 
 cp -av samba.spec ${SPECDIR}
-cp -av samba-devel.spec ${SPECDIR}
 
-if [ z$1 = "zdevel" ]; then
-       echo Restoring source samba directory name
-       ( cd ../../.. ; mv samba-${VERSION} samba )
-       echo Getting Ready to build Developmental Build
-       cd ${SPECDIR}
-       ${RPM} -ba -v samba-devel.spec
-else
-       echo Getting Ready to build release package
-       cd ${SPECDIR}
-       ${RPM} -ba -v --clean --rmsource samba.spec
-fi
+echo Getting Ready to build release package
+cd ${SPECDIR}
+${RPM} -ba -v --clean --rmsource samba.spec
 
 echo Done.
 

diff --git a/packaging/RedHat/samba2.spec.tmpl b/packaging/RedHat/samba2.spec.tmpl
index 408ea16a9f12817a0a5f03fe8aa9052992d7c288..a3c603c12acffac94cd28240ba61d26c262a4052 100644 (file)
--- a/packaging/RedHat/samba2.spec.tmpl
+++ b/packaging/RedHat/samba2.spec.tmpl
@@ -47,6 +47,9 @@ autoconf
 EXTRA="-D_LARGEFILE64_SOURCE"
 %endif
 NUMCPU=`grep processor /proc/cpuinfo | wc -l`
+if [ ! -f "configure" ]; then
+       ./autogen.sh
+fi
 CFLAGS="$RPM_OPT_FLAGS $EXTRA" ./configure \
        --prefix=%{prefix} \
        --localstatedir=/var \