packaging updates; use rpm -E when possible for spec & src dir; also avoid Net::LDAP...

(This used to be commit 3b31d1aa8ff3baaa48beee86e72e8a6caaf5ac1b)

diff --git a/packaging/RedHat/filter-requires-samba.sh b/packaging/RedHat/filter-requires-samba.sh
new file mode 100755 (executable)
index 0000000..8d4f7fb
--- /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 dc82033b06a6efc930da99f4faa4734fa4dd4f76..92037c75c1f42dd8369e3a89b361809d29cb2809 100644 (file)
--- 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 718fe38bc86e013010ec3951888ab3fabeac08d4..725809b07529cb1cee787e291ed5cf44bac0420d 100644 (file)
--- 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