[Fedora-directory-commits] dsbuild/ds/cyrus-sasl .cvsignore, NONE, 1.1 Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/dsbuild/ds/cyrus-sasl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/ds/cyrus-sasl

Modified Files:
	Makefile checksums 
Added Files:
	.cvsignore 
Log Message:
updated for Fedora DS 1.1


--- NEW FILE .cvsignore ---
download
work
cookies


Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/cyrus-sasl/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile	10 Feb 2006 15:28:53 -0000	1.1.1.1
+++ Makefile	8 Feb 2008 21:51:52 -0000	1.2
@@ -1,9 +1,9 @@
 GARNAME = cyrus-sasl
-GARVERSION = 2.1.20
+GARVERSION = 2.1.22
 CATEGORIES = ds
 # have the regular download rule download the patch rather than listing it in PATCHFILES
 # this is so we can override the default patch rule
-MYPATCH = cyrus-sasl-2.1.20-gcc4.patch
+MYPATCH = 
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz $(MYPATCH)
 PATCHFILES = 
 
@@ -13,9 +13,11 @@
 
 CONFIGURE_SCRIPTS = $(WORKSRC)/configure
 BUILD_SCRIPTS = $(WORKSRC)/Makefile
-INSTALL_SCRIPTS = custom
+INSTALL_SCRIPTS = $(WORKSRC)/Makefile
 
-CONFIGURE_ARGS = --enable-static --enable-gssapi=/usr/kerberos/include --without-des --without-openssl
+#CONFIGURE_ARGS = --enable-gssapi=/usr/kerberos/include --without-des --without-openssl
+CONFIGURE_ARGS = --enable-gssapi --without-des --without-openssl \
+	--with-dblib=none --with-plugindir=$(PREFIX)/lib/sasl2
 
 ifdef DEBUG
 CONFIGURE_ENV = CFLAGS=-g
@@ -24,12 +26,11 @@
 endif
 
 # this is our "custom" patch target
+ifdef MYPATCH
 post-patch:
 	cat $(addprefix download/,$(MYPATCH)) | ( cd work ; patch -p0 )
 	$(MAKECOOKIE)
-
-install-custom:
-	$(MAKECOOKIE)
+endif
 
 include ../../gar.conf.mk
 


Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/cyrus-sasl/checksums,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- checksums	10 Feb 2006 15:28:53 -0000	1.1.1.1
+++ checksums	8 Feb 2008 21:51:53 -0000	1.2
@@ -1,2 +1 @@
-268ead27f4ac39bcfe17d9e38e0f2977  download/cyrus-sasl-2.1.20.tar.gz
-55e7a90561d9b02e0e7e0d598f5f6356  download/cyrus-sasl-2.1.20-gcc4.patch
+45dde9d19193ae9dd388eb68b2027bc9  download/cyrus-sasl-2.1.22.tar.gz