summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-01-21 23:06:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:55:07 -0500
commit5876aa1a78141593c7f085f158568df663ee0352 (patch)
tree990cb0c28bcc7a3d0457c990c4f3cbab45ec0970
parent4417bf44ad90aadbcdac5409a8ef02ac536e06ec (diff)
downloadsamba-5876aa1a78141593c7f085f158568df663ee0352.tar.gz
samba-5876aa1a78141593c7f085f158568df663ee0352.tar.bz2
samba-5876aa1a78141593c7f085f158568df663ee0352.zip
r4913: fixing 'perl requires' filters for RPM packaging on RedHat/Fedora
(This used to be commit 6b38a3923c403562c26642f24477c607a4295878)
-rwxr-xr-xpackaging/Fedora/filter-requires-samba.sh3
-rwxr-xr-xpackaging/RedHat/filter-requires-samba_rh9.sh4
2 files changed, 5 insertions, 2 deletions
diff --git a/packaging/Fedora/filter-requires-samba.sh b/packaging/Fedora/filter-requires-samba.sh
index 1ba10a0ee3..5545cf6c85 100755
--- a/packaging/Fedora/filter-requires-samba.sh
+++ b/packaging/Fedora/filter-requires-samba.sh
@@ -1,3 +1,4 @@
#!/bin/sh
-/usr/lib/rpm/perl.req $* | grep -v "Net::LDAP"
+/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI)'
+
diff --git a/packaging/RedHat/filter-requires-samba_rh9.sh b/packaging/RedHat/filter-requires-samba_rh9.sh
index 8378523bce..5545cf6c85 100755
--- a/packaging/RedHat/filter-requires-samba_rh9.sh
+++ b/packaging/RedHat/filter-requires-samba_rh9.sh
@@ -1,2 +1,4 @@
#!/bin/sh
-/usr/lib/rpm/perl.req $* | egrep -v '(Net::LDAP|CGI)'
+
+/usr/lib/rpm/perl.req $* | grep -E -v '(Net::LDAP|Crypt::SmbHash|CGI)'
+