Hello community, here is the log from the commit of package boinc-client for openSUSE:12.2 checked in at 2012-07-10 17:03:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/boinc-client (Old) and /work/SRC/openSUSE:12.2/.boinc-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "boinc-client", Maintainer is "gnome-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:12.2/boinc-client/boinc-client.changes 2012-07-09 18:26:10.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.boinc-client.new/boinc-client.changes 2012-07-10 17:03:55.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Jul 10 13:50:30 UTC 2012 - ch...@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 - co...@suse.com + +- fix compilation for factory and 12.2 + +------------------------------------------------------------------- New: ---- boinc-client-AM_CONDITIONAL.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ boinc-client.spec ++++++ --- /var/tmp/diff_new_pack.4G8qSO/_old 2012-07-10 17:03:55.000000000 +0200 +++ /var/tmp/diff_new_pack.4G8qSO/_new 2012-07-10 17:03:55.000000000 +0200 @@ -68,6 +68,8 @@ 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 @@ %patch5 %if 0%{?suse_version} >= 1220 %patch6 +%patch7 %endif # Install user hints ++++++ boinc-client-AM_CONDITIONAL.patch ++++++ 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' $^ > $@ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org