rpms/cyrus-sasl/F-8 make-no-dlcompatorsrp-tarball.sh, NONE, 1.1 .cvsignore, 1.16, 1.17 cyrus-sasl.spec, 1.60, 1.61 sources, 1.19, 1.20 make-no-dlcompat-tarball.sh, 1.3, NONE

[Steve Conklin (sconklin)]

Author: sconklin

Update of /cvs/pkgs/rpms/cyrus-sasl/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24656

Modified Files:
	.cvsignore cyrus-sasl.spec sources 
Added Files:
	make-no-dlcompatorsrp-tarball.sh 
Removed Files:
	make-no-dlcompat-tarball.sh 
Log Message:
Removed srp plugin source from tarball, added dist to NVR



--- NEW FILE make-no-dlcompatorsrp-tarball.sh ---
#!/bin/bash -e
#
#  See ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ for unmodified sources.
#

tmppath=`mktemp -d ${TMPDIR:-/tmp}/make-no-dlcompat-tarball-XXXXXX`
if test -z "$tmppath" ; then
	echo Error creating temporary directory.
	exit 1
fi
trap "rm -fr $tmppath" EXIT

initialdir=`pwd`

for tarball in ${initialdir}/cyrus-sasl-*.tar.{gz,bz2} ; do
	if ! test -s "$tarball" ; then
		continue
	fi
	rm -fr $tmppath/*
	pushd $tmppath > /dev/null
	case "$tarball" in
	*nodlcompat*)
		: Do nothing.
		;;
	*.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`-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`-nodlcompatorsrp.tar.bz2
		;;
	esac
	popd > /dev/null
done


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/F-8/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	18 Sep 2007 16:23:56 -0000	1.16
+++ .cvsignore	7 Nov 2007 20:35:38 -0000	1.17
@@ -11,3 +11,4 @@
 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


Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/F-8/cyrus-sasl.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- cyrus-sasl.spec	18 Sep 2007 16:23:56 -0000	1.60
+++ cyrus-sasl.spec	7 Nov 2007 20:35:38 -0000	1.61
@@ -5,19 +5,19 @@
 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
-# new tarball.
-Source0: cyrus-sasl-%{version}-nodlcompat.tar.gz
+# make-no-dlcompatorsrp-tarball.sh removes the "dlcompat" subdirectory and srp plugin source
+# and builds a new tarball.
+Source0: cyrus-sasl-%{version}-nodlcompatorsrp.tar.gz
 Source4: saslauthd.init
 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 @@
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Wed Nov  7 2007 Steve Conklin <sconklin at redhat.com> - 2.1.22-8
+- Removed srp plugin source, and added dist to NVR
+
 * Tue Sep 18 2007 Steve Conklin <sconklin at redhat.com> 2.1.22-7
 - use db4 version 4.6.19 bz#249737
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/F-8/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	18 Sep 2007 16:23:56 -0000	1.19
+++ sources	7 Nov 2007 20:35:38 -0000	1.20
@@ -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


--- make-no-dlcompat-tarball.sh DELETED ---