diff options
| author | Gerald Carter <jerry@samba.org> | 2005-01-26 21:06:48 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2005-01-26 21:06:48 +0000 |
| commit | d9abdd45339e2d65445a1fd685cb0294729ac4e7 (patch) | |
| tree | ef5e8cff95f9ffda2e7c29ff1790dd705c250fd7 /packaging | |
| parent | 4b3500c58d177e2b48e6e04e027efffd4d079d8a (diff) | |
| download | samba-d9abdd45339e2d65445a1fd685cb0294729ac4e7.tar.gz samba-d9abdd45339e2d65445a1fd685cb0294729ac4e7.tar.xz samba-d9abdd45339e2d65445a1fd685cb0294729ac4e7.zip | |
r5021: Starting to look at final code for 3.0.11rc1.
Set VERSION and merged important and/or low risk
fixes from 3_0
svn merge -r4905:4907 $SVNURL/branches/SAMBA_3_0
svn merge -r4907:4913 $SVNURL/branches/SAMBA_3_0
svn merge -r4932:4933 $SVNURL/branches/SAMBA_3_0
svn merge -r4933:4946 $SVNURL/branches/SAMBA_3_0
svn merge -r4946:4963 $SVNURL/branches/SAMBA_3_0
svn merge -r4963:4964 $SVNURL/branches/SAMBA_3_0
svn merge -r4964:4965 $SVNURL/branches/SAMBA_3_0
svn merge -r4965:4966 $SVNURL/branches/SAMBA_3_0
svn merge -r4966:4967 $SVNURL/branches/SAMBA_3_0
svn merge -r4967:4970 $SVNURL/branches/SAMBA_3_0
svn merge -r4972:4976 $SVNURL/branches/SAMBA_3_0
svn merge -r4970:4972 $SVNURL/branches/SAMBA_3_0
svn merge -r4976:4988 $SVNURL/branches/SAMBA_3_0
svn merge -r4988:4989 $SVNURL/branches/SAMBA_3_0
svn merge -r4994:4995 $SVNURL/branches/SAMBA_3_0
svn merge -r4995:4996 $SVNURL/branches/SAMBA_3_0
svn merge -r5000:5002 $SVNURL/branches/SAMBA_3_0
svn merge -r5002:5012 $SVNURL/branches/SAMBA_3_0
svn merge -r5012:5014 $SVNURL/branches/SAMBA_3_0
svn merge -r5014:5015 $SVNURL/branches/SAMBA_3_0
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/Fedora/filter-requires-samba.sh | 3 | ||||
| -rwxr-xr-x | packaging/RedHat/filter-requires-samba_rh9.sh | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/packaging/Fedora/filter-requires-samba.sh b/packaging/Fedora/filter-requires-samba.sh index 1ba10a0ee3d..5545cf6c858 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 8378523bceb..5545cf6c858 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)' + |