diff --git a/fix-automake-conditional.patch b/boinc-client-AM_CONDITIONAL.patch similarity index 78% rename from fix-automake-conditional.patch rename to boinc-client-AM_CONDITIONAL.patch index e16d2c1..86c5525 100644 --- a/fix-automake-conditional.patch +++ b/boinc-client-AM_CONDITIONAL.patch @@ -1,7 +1,7 @@ -Index: boinc_core_release_6_12_43/configure.ac +Index: configure.ac =================================================================== ---- boinc_core_release_6_12_43.orig/configure.ac 2012-07-10 13:47:58.000000000 +0200 -+++ boinc_core_release_6_12_43/configure.ac 2012-07-10 14:11:55.043582540 +0200 +--- configure.ac.orig ++++ configure.ac @@ -39,6 +39,7 @@ AC_PROG_CC AC_PROG_CXX AC_PROG_F77 @@ -19,10 +19,10 @@ Index: boinc_core_release_6_12_43/configure.ac dnl ====================================================================== dnl some more vodoo required for building portable client-binary (client, clientgui) dnl ====================================================================== -Index: boinc_core_release_6_12_43/clientgui/Makefile.am +Index: clientgui/Makefile.am =================================================================== ---- boinc_core_release_6_12_43.orig/clientgui/Makefile.am 2012-02-02 00:02:32.000000000 +0100 -+++ boinc_core_release_6_12_43/clientgui/Makefile.am 2012-07-10 14:14:26.374552322 +0200 +--- clientgui/Makefile.am.orig ++++ clientgui/Makefile.am @@ -118,9 +118,8 @@ EXTRA_DIST = *.h \ ../lib/error_numbers.h \ locale $(mac_headers) diff --git a/boinc-client.changes b/boinc-client.changes index 141254c..51dcb4e 100644 --- a/boinc-client.changes +++ b/boinc-client.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jul 10 13:50:30 UTC 2012 - chris@computersalat.de + +- rename patch + * fix-automake-conditional to boinc-client-AM_CONDITIONAL patch +- fix build for SLE_11 + * AM_CONDITIONAL patch >= 12.2 + ------------------------------------------------------------------- Tue Jul 10 12:24:13 UTC 2012 - coolo@suse.com diff --git a/boinc-client.spec b/boinc-client.spec index c231ca0..f21fcd9 100644 --- a/boinc-client.spec +++ b/boinc-client.spec @@ -68,7 +68,8 @@ Patch4: boinc-docbook2x.patch Patch5: boinc-client-dynamic_buffers.patch # PATCH-FIX-OPENSUSE computersalat - #error "Only can be included directly. Patch6: %{name}-glib_h.patch -Patch7: fix-automake-conditional.patch +# PATCH-FIX-OPENSUSE coolo - #error: am__fastdepOBJCXX does not appear in AM_CONDITIONAL +Patch7: %{name}-AM_CONDITIONAL.patch # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -190,8 +191,8 @@ This package contains documentation files for %{name}. %patch5 %if 0%{?suse_version} >= 1220 %patch6 +%patch7 %endif -%patch7 -p1 # Install user hints %{__install} -m0644 %{S:3} README.SUSE