diff options
| author | Gerald Carter <jerry@samba.org> | 2003-04-29 15:54:26 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-04-29 15:54:26 +0000 |
| commit | bed55df612863d6051bfa26fd34f5ed38c8db166 (patch) | |
| tree | cca5b8512102aeda352e0b2e4c93facb4f6c56ea | |
| parent | ada60ce8a28e969b1ab888d41404755628d59426 (diff) | |
| download | samba-bed55df612863d6051bfa26fd34f5ed38c8db166.tar.gz samba-bed55df612863d6051bfa26fd34f5ed38c8db166.tar.bz2 samba-bed55df612863d6051bfa26fd34f5ed38c8db166.zip | |
remove 'devel' option to makerpms.sh.tmpl since we don't use it n the RH packaging anymore and make sure to run autogen.sh if configure doesn't exist (make building from CVS easier)
(This used to be commit bfcdd769f5fd008bf8113c4fe82c3791bd354398)
| -rw-r--r-- | packaging/RedHat/makerpms.sh.tmpl | 20 | ||||
| -rw-r--r-- | packaging/RedHat/samba2.spec.tmpl | 3 |
2 files changed, 6 insertions, 17 deletions
diff --git a/packaging/RedHat/makerpms.sh.tmpl b/packaging/RedHat/makerpms.sh.tmpl index 3c4ff40ddc..ee5ebd5040 100644 --- 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 408ea16a9f..a3c603c12a 100644 --- 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 \ |