diff options
| author | Gerald Carter <jerry@samba.org> | 2003-08-29 18:49:55 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-08-29 18:49:55 +0000 |
| commit | 2ce05b7a3f8c0c88639b309e97928fb5b55c9642 (patch) | |
| tree | c4237825dbb22fd30aadfbe11fb46dbbb2b9691a | |
| parent | 1e5411ca8257ac16195411b7105ebcd6a2bb4fb1 (diff) | |
| download | samba-2ce05b7a3f8c0c88639b309e97928fb5b55c9642.tar.gz samba-2ce05b7a3f8c0c88639b309e97928fb5b55c9642.tar.bz2 samba-2ce05b7a3f8c0c88639b309e97928fb5b55c9642.zip | |
packaging updates; use rpm -E when possible for spec & src dir; also avoid Net::LDAP dependencies
(This used to be commit 3b31d1aa8ff3baaa48beee86e72e8a6caaf5ac1b)
| -rwxr-xr-x | packaging/RedHat/filter-requires-samba.sh | 5 | ||||
| -rw-r--r-- | packaging/RedHat/makerpms.sh.tmpl | 4 | ||||
| -rw-r--r-- | packaging/RedHat/samba.spec.tmpl | 7 |
3 files changed, 14 insertions, 2 deletions
diff --git a/packaging/RedHat/filter-requires-samba.sh b/packaging/RedHat/filter-requires-samba.sh new file mode 100755 index 0000000000..8d4f7fbc60 --- /dev/null +++ b/packaging/RedHat/filter-requires-samba.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +## snarfed from the RedHat Rawhide samba SRPM + +/usr/lib/rpm/perl.req $* | grep -v "Net::LDAP" diff --git a/packaging/RedHat/makerpms.sh.tmpl b/packaging/RedHat/makerpms.sh.tmpl index dc82033b06..92037c75c1 100644 --- a/packaging/RedHat/makerpms.sh.tmpl +++ b/packaging/RedHat/makerpms.sh.tmpl @@ -63,8 +63,8 @@ esac ( cd ../../.. ; chown -R ${USERID}.${GRPID} samba-${VERSION} ) ( cd ../../.. ; tar --exclude=CVS -cf - samba-${VERSION}/. | bzip2 > ${SRCDIR}/samba-${VERSION}.tar.bz2 ) - -cp -av $SPECFILE ${SPECDIR} +/bin/cp -p filter-requires-samba.sh ${SRCDIR} +/bin/cp -av $SPECFILE ${SPECDIR} echo Getting Ready to build release package cd ${SPECDIR} diff --git a/packaging/RedHat/samba.spec.tmpl b/packaging/RedHat/samba.spec.tmpl index 718fe38bc8..725809b075 100644 --- a/packaging/RedHat/samba.spec.tmpl +++ b/packaging/RedHat/samba.spec.tmpl @@ -5,6 +5,10 @@ Release: PRELEASE License: GNU GPL version 2 Group: Networking Source: http://download.samba.org/samba/ftp/samba-%{version}.tar.bz2 + +# Don't depend on Net::LDAP +Source999: filter-requires-samba.sh + Packager: Gerald Carter [Samba-Team] <jerry@samba.org> Requires: pam >= 0.72 kernel >= 2.2.1 glibc >= 2.1.2 Prereq: chkconfig fileutils /sbin/ldconfig @@ -13,6 +17,9 @@ Obsoletes: samba-common, samba-client, samba-swat BuildRoot: %{_tmppath}/%{name}-%{version}-root Prefix: /usr +# Working around perl dependency problem from docs +%define __perl_requires %{SOURCE999} + %description Samba provides an SMB/CIFS server which can be used to provide network file and print services to SMB/CIFS clients, including |