diff options
| author | Gerald Carter <jerry@samba.org> | 2002-11-19 19:41:49 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-11-19 19:41:49 +0000 |
| commit | 0092c15031b4419e16ad22ec3b1e0382ee794538 (patch) | |
| tree | 1e30a4dd9f36da1f92cae9363a446b4151df9f67 /packaging | |
| parent | 1b28a4cb169862e956cd2bf818584f938a1d1e45 (diff) | |
| download | samba-0092c15031b4419e16ad22ec3b1e0382ee794538.tar.gz | |
sync with SAMBA_2_2
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/RedHat/makerpms.sh.tmpl | 13 | ||||
| -rw-r--r-- | packaging/RedHat/samba2.spec.tmpl | 6 |
2 files changed, 14 insertions, 5 deletions
diff --git a/packaging/RedHat/makerpms.sh.tmpl b/packaging/RedHat/makerpms.sh.tmpl index 0b207851298..31e660d9450 100644 --- a/packaging/RedHat/makerpms.sh.tmpl +++ b/packaging/RedHat/makerpms.sh.tmpl @@ -30,6 +30,7 @@ GRPID=`id -g` VERSION='PVERSION' RPMVER=`rpm --version | awk '{print $3}'` +RPM="rpm" echo The RPM Version on this machine is: $RPMVER case $RPMVER in @@ -43,6 +44,12 @@ case $RPMVER in 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 @@ -62,7 +69,7 @@ if [ z$1 = z"devel" ]; then (cd ../../.. ; mv samba samba-${VERSION} ) fi -( cd ../../.. ; tar --exclude=CVS -czvf ${SRCDIR}/samba-${VERSION}.tar.gz samba-${VERSION} ) +( cd ../../.. ; tar --exclude=CVS -cf - samba-${VERSION}/. | bzip2 > ${SRCDIR}/samba-${VERSION}.tar.bz2 ) cp -av samba.spec ${SPECDIR} cp -av samba-devel.spec ${SPECDIR} @@ -72,11 +79,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. diff --git a/packaging/RedHat/samba2.spec.tmpl b/packaging/RedHat/samba2.spec.tmpl index f2fb80f2585..242b6db2048 100644 --- a/packaging/RedHat/samba2.spec.tmpl +++ b/packaging/RedHat/samba2.spec.tmpl @@ -4,7 +4,7 @@ Version: PVERSION Release: PRELEASE Copyright: GNU GPL version 2 Group: Networking -Source: ftp://samba.org/pub/samba/samba-%{version}.tar.gz +Source: http://download.samba.org/samba/ftp/samba-%{version}.tar.bz2 Packager: John H Terpstra [Samba-Team] <jht@samba.org> Requires: pam >= 0.72 kernel >= 2.2.1 glibc >= 2.1.2 Prereq: chkconfig fileutils @@ -196,8 +196,10 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA" ./configure \ --prefix=%{prefix} \ --localstatedir=/var make +cd ../.. - +# Remove some permission bits to avoid to many dependencies +find examples docs -type f | xargs -r chmod -x %install rm -rf $RPM_BUILD_ROOT |