- fix parallel building

Changed files:
    cyrus-sasl-parallel-make.patch -> 1.1
    cyrus-sasl.spec -> 1.180

diff --git a/cyrus-sasl-parallel-make.patch b/cyrus-sasl-parallel-make.patch
new file mode 100644 (file)
index 0000000..38e9a24
--- /dev/null
+++ b/cyrus-sasl-parallel-make.patch
@@ -0,0 +1,47 @@
+diff -ur cyrus-sasl-2.1.23.orig/plugins/Makefile.am cyrus-sasl-2.1.23/plugins/Makefile.am
+--- cyrus-sasl-2.1.23.orig/plugins/Makefile.am 2009-12-09 08:19:06.981152890 +0000
++++ cyrus-sasl-2.1.23/plugins/Makefile.am      2009-12-09 08:33:41.561911411 +0000
+@@ -186,8 +186,8 @@
+ 
+ CLEANFILES=$(init_src)
+ 
+-${init_src}: $(srcdir)/makeinit.sh
+-      $(SHELL) $(srcdir)/makeinit.sh
++${init_src}: $(srcdir)/makeinit.sh $@
++      $(SHELL) $(srcdir)/makeinit.sh $@
+ 
+ # Compatibility function build rules (they build in lib/)
+ $(COMPAT_OBJS):
+diff -ur cyrus-sasl-2.1.23.orig/plugins/makeinit.sh cyrus-sasl-2.1.23/plugins/makeinit.sh
+--- cyrus-sasl-2.1.23.orig/plugins/makeinit.sh 2009-12-09 08:19:06.921144397 +0000
++++ cyrus-sasl-2.1.23/plugins/makeinit.sh      2009-12-09 08:25:31.644442215 +0000
+@@ -1,5 +1,6 @@
+-for mech in anonymous crammd5 digestmd5 gssapiv2 kerberos4 login ntlm otp passdss plain srp; do
+-
++mech="${1%_init.c}"
++case "$mech" in
++      anonymous|crammd5|digestmd5|gssapiv2|kerberos4|login|ntlm|otp|passdss|plain|srp)
+ echo "
+ #include <config.h>
+ 
+@@ -43,10 +44,9 @@
+ SASL_CLIENT_PLUG_INIT( $mech )
+ SASL_SERVER_PLUG_INIT( $mech )
+ " > ${mech}_init.c
+-done
+-
+-for mech in sasldb mysql pgsql sqlite ldapdb; do
++;;
+ 
++      sasldb|mysql|pgsql|sqlite|ldapdb)
+ echo "
+ #include <config.h>
+ 
+@@ -85,5 +85,6 @@
+ 
+ SASL_AUXPROP_PLUG_INIT( $mech )
+ " > ${mech}_init.c
+-done
++;;
++esac
+ 

diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index be30235540759bdd8a775ac9f6004b59b6b58398..cd04f4fd302d3f376c1468ab6b9aeeb0c802654d 100644 (file)
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -48,6 +48,7 @@ Patch9:               %{name}-digest-commas.patch
 Patch10:       %{name}-keytab.patch
 Patch11:       %{name}-sizes.patch
 Patch12:       %{name}-nagios-plugin.patch
+Patch13:       %{name}-parallel-make.patch
 URL:           http://asg.web.cmu.edu/sasl/
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake
@@ -455,6 +456,7 @@ Wtyczka Nagiosa do sprawdzania działania saslauthd.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 cd doc
 echo "cyrus-sasl complies with the following RFCs:" > rfc-compliance