Accepting request 127526 from network

fix build for SLE_11 (forwarded request 127525 from computersalat)

OBS-URL: https://build.opensuse.org/request/show/127526
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boinc-client?expand=0&rev=23

boinc-client-AM_CONDITIONAL.patch

@@ -0,0 +1,37 @@
+Index: configure.ac
+===================================================================
+--- configure.ac.orig
++++ configure.ac
+@@ -39,6 +39,7 @@ AC_PROG_CC
+ AC_PROG_CXX
+ AC_PROG_F77
+ AC_PROG_CPP
++AC_PROG_OBJCXX
+ AC_PROG_MAKE_SET
+ SAH_LINKS
+ AC_LANG_PUSH(C)
+@@ -737,6 +738,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test "
+ AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
+ AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
+ 
++PKG_CHECK_MODULES([GTK2], [gtk+-2.0])
++
+ dnl ======================================================================
+ dnl some more vodoo required for building portable client-binary (client, clientgui)
+ dnl ======================================================================
+Index: clientgui/Makefile.am
+===================================================================
+--- clientgui/Makefile.am.orig
++++ clientgui/Makefile.am
+@@ -118,9 +118,8 @@ EXTRA_DIST = *.h \
+     ../lib/error_numbers.h \
+     locale $(mac_headers)
+ 
+-boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) `pkg-config --cflags gtk+-2.0`
+-boincmgr_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) `pkg-config --cflags gtk+-2.0`
+-boincmgr_LDADD = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS)
++boincmgr_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(SQLITE3_CPPFLAGS) $(LIBNOTIFY_CFLAGS) $(CLIENTGUIFLAGS) $(GTK2_CFLAGS)
++boincmgr_LDADD = $(LIBBOINC) $(SQLITE3_LIBS) $(LIBNOTIFY_LIBS) $(CLIENTGUILIBS) $(BOINC_EXTRA_LIBS) $(CLIENTLIBS) $(GTK2_LIBS)
+ 
+ win_config.h: $(top_srcdir)/config.h
+ 	grep '#define.*BOINC.*VERSION' $^ > $@

boinc-client.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+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
+
+- fix compilation for factory and 12.2
+
 -------------------------------------------------------------------
 Sun Jul  1 19:51:54 UTC 2012 - chris@computersalat.de
 

boinc-client.spec

@@ -68,6 +68,8 @@ Patch4:         boinc-docbook2x.patch
 Patch5:         boinc-client-dynamic_buffers.patch
 # PATCH-FIX-OPENSUSE computersalat - #error "Only <glib.h> can be included directly.
 Patch6:         %{name}-glib_h.patch
+# PATCH-FIX-OPENSUSE coolo - #error: am__fastdepOBJCXX does not appear in AM_CONDITIONAL
+Patch7:         %{name}-AM_CONDITIONAL.patch
 #
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -189,6 +191,7 @@ This package contains documentation files for %{name}.
 %patch5
 %if 0%{?suse_version} >= 1220
 %patch6
+%patch7
 %endif
 
 # Install user hints