diff --git a/.cvsignore b/.cvsignore index 176bb2d..2a0b651 100644 --- a/.cvsignore +++ b/.cvsignore @@ -11,3 +11,4 @@ cyrus-sasl-2.1.22.tar.gz cyrus-sasl-2.1.22.tar.gz.sig cyrus-sasl-2.1.22-nodlcompat.tar.gz db-4.6.19.tar.gz +cyrus-sasl-2.1.22-nodlcompatorsrp.tar.gz diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 972678d..fc8c7fa 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -5,11 +5,11 @@ Summary: The Cyrus SASL library Name: cyrus-sasl Version: 2.1.22 -Release: 7 +Release: 8%{?dist} License: BSD Group: System Environment/Libraries # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/; -# make-no-dlcompat-tarball.sh removes the "dlcompat" subdirectory and builds a +# make-no-dlcompatorsrp-tarball.sh removes the "dlcompat" subdirectory and builds a # new tarball. Source0: cyrus-sasl-%{version}-nodlcompat.tar.gz Source4: saslauthd.init @@ -17,7 +17,7 @@ Source6: http://www.sleepycat.com/update/%{db_version}/db-%{db_version}.tar.gz Source7: sasl-mechlist.c Source8: sasl-checkpass.c Source9: saslauthd.sysconfig -Source10: make-no-dlcompat-tarball.sh +Source10: make-no-dlcompatorsrp-tarball.sh URL: http://asg.web.cmu.edu/sasl/sasl-library.html Requires: %{name}-lib = %{version}-%{release} Patch10: cyrus-sasl-2.1.22-db_bundle.patch @@ -377,6 +377,9 @@ fi %{_sbindir}/sasl2-shared-mechlist %changelog +* Wed Nov 7 2007 Steve Conklin - 2.1.22-8 +- Removed srp plugin source and added dist to NVR + * Tue Sep 18 2007 Steve Conklin 2.1.22-7 - use db4 version 4.6.19 bz#249737 diff --git a/make-no-dlcompat-tarball.sh b/make-no-dlcompatorsrp-tarball.sh similarity index 78% rename from make-no-dlcompat-tarball.sh rename to make-no-dlcompatorsrp-tarball.sh index 9fe9aa6..a0a3245 100755 --- a/make-no-dlcompat-tarball.sh +++ b/make-no-dlcompatorsrp-tarball.sh @@ -25,14 +25,16 @@ for tarball in ${initialdir}/cyrus-sasl-*.tar.{gz,bz2} ; do *.gz) gzip -dc "$tarball" | tar xf - rm -fr cyrus-sasl-*/dlcompat* + rm -fr cyrus-sasl-*/plugins/srp* tar cf - * | gzip -9c > \ - $initialdir/`basename $tarball .tar.gz`-nodlcompat.tar.gz + $initialdir/`basename $tarball .tar.gz`-nodlcompatorsrp.tar.gz ;; *.bz2) bzip2 -dc "$tarball" | tar xf - rm -fr cyrus-sasl-*/dlcompat* + rm -fr cyrus-sasl-*/plugins/srp* tar cf - * | bzip2 -9c > \ - $initialdir/`basename $tarball .tar.bz2`-nodlcompat.tar.bz2 + $initialdir/`basename $tarball .tar.bz2`-nodlcompatorsrp.tar.bz2 ;; esac popd > /dev/null diff --git a/sources b/sources index ce9836b..1099d6a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -c5c56c86a1397443d3b75b6864cb630d cyrus-sasl-2.1.22-nodlcompat.tar.gz 89c7390ff120d5ebf3eccc5f97249e79 db-4.6.19.tar.gz +4dde83929ded5435e4c72e7cc06b0ebb cyrus-sasl-2.1.22-nodlcompatorsrp.tar.gz