- attempt to fix parallel build

Changed files:
    heimdal-make.patch -> 1.1
    heimdal.spec -> 1.207

diff --git a/heimdal-make.patch b/heimdal-make.patch
new file mode 100644 (file)
index 0000000..573455d
--- /dev/null
+++ b/heimdal-make.patch
@@ -0,0 +1,29 @@
+--- heimdal-1.4/lib/asn1/Makefile.am~  2010-09-13 09:23:34.000000000 +0200
++++ heimdal-1.4/lib/asn1/Makefile.am   2010-10-02 12:08:31.833815205 +0200
+@@ -641,16 +641,16 @@
+ 
+ asn1parse.h: asn1parse.c
+ 
+-$(gen_files_krb5) krb5_asn1.hx krb5_asn1-priv.hx: krb5_asn1_files
+-$(gen_files_pkinit) pkinit_asn1.hx pkinit_asn1-priv.hx: pkinit_asn1_files
+-$(gen_files_pkcs8) pkcs8_asn1.hx pkcs8_asn1-priv.hx: pkcs8_asn1_files
+-$(gen_files_pkcs9) pkcs9_asn1.hx pkcs9_asn1-priv.hx: pkcs9_asn1_files
+-$(gen_files_pkcs12) pkcs12_asn1.hx pkcs12_asn1-priv.hx: pkcs12_asn1_files
+-$(gen_files_digest) digest_asn1.hx digest_asn1-priv.hx: digest_asn1_files
+-$(gen_files_kx509) kx509_asn1.hx kx509_asn1-priv.hx: kx509_asn1_files
+-$(gen_files_rfc2459) rfc2459_asn1.hx rfc2459_asn1-priv.hx: rfc2459_asn1_files
+-$(gen_files_cms) cms_asn1.hx cms_asn1-priv.hx: cms_asn1_files
+-$(gen_files_test) test_asn1.hx test_asn1-priv.hx: test_asn1_files
++$(gen_files_krb5) krb5_asn1.hx krb5_asn1-priv.hx krb5_asn1-template.c: krb5_asn1_files
++$(gen_files_pkinit) pkinit_asn1.hx pkinit_asn1-priv.hx pkinit_asn1-template.c: pkinit_asn1_files
++$(gen_files_pkcs8) pkcs8_asn1.hx pkcs8_asn1-priv.hx pkcs8_asn1-template.c: pkcs8_asn1_files
++$(gen_files_pkcs9) pkcs9_asn1.hx pkcs9_asn1-priv.hx pkcs9_asn1-template.c: pkcs9_asn1_files
++$(gen_files_pkcs12) pkcs12_asn1.hx pkcs12_asn1-priv.hx pkcs12_asn1-template.c: pkcs12_asn1_files
++$(gen_files_digest) digest_asn1.hx digest_asn1-priv.hx digest_asn1-template.c: digest_asn1_files
++$(gen_files_kx509) kx509_asn1.hx kx509_asn1-priv.hx kx509_asn1-template.c: kx509_asn1_files
++$(gen_files_rfc2459) rfc2459_asn1.hx rfc2459_asn1-priv.hx rfc2459_asn1-template.c: rfc2459_asn1_files
++$(gen_files_cms) cms_asn1.hx cms_asn1-priv.hx cms_asn1-template.c: cms_asn1_files
++$(gen_files_test) test_asn1.hx test_asn1-priv.hx test_asn1-template.c: test_asn1_files
+ 
+ rfc2459_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/rfc2459.asn1
+       $(ASN1_COMPILE) --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints $(srcdir)/rfc2459.asn1 rfc2459_asn1 || (rm -f rfc2459_asn1_files ; exit 1)

diff --git a/heimdal.spec b/heimdal.spec
index 960e14c4fe4987042edd9d037b8d264f7b593e6a..a8cc5034e36fe71d8c915b602bbbca7ebfac9958 100644 (file)
--- a/heimdal.spec
+++ b/heimdal.spec
@@ -30,6 +30,7 @@ Patch3:               %{name}-dbpaths.patch
 Patch4:                %{name}-db4.patch
 Patch5:                %{name}-libadd.patch
 Patch6:                %{name}-signal.patch
+Patch7:                %{name}-make.patch
 Patch8:                %{name}-info.patch
 Patch9:                %{name}-shared-libcom_err.patch
 Patch10:       %{name}-sbindir.patch
@@ -355,6 +356,7 @@ Demony korzystające z systemu Kerberos do autoryzacji dostępu.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
@@ -381,9 +383,6 @@ rm -f acinclude.m4 cf/{libtool,lt*}.m4
        --with-sqlite3=/usr \
        --with%{!?with_x11:out}-x
 
-# Makefile lacks proper deps so without it multi-job make sometimes fails
-%{__make} -C lib/kadm5 kadm5_err.h
-
 %{__make}
 
 %install