- fixed building with glib >= 2.30

diff --git a/libbonobo-glib.patch b/libbonobo-glib.patch
new file mode 100644 (file)
index 0000000..b6cdab5
--- /dev/null
+++ b/libbonobo-glib.patch
@@ -0,0 +1,34 @@
+diff -ur libbonobo-2.32.1.orig/activation-server/Makefile.am libbonobo-2.32.1.fix/activation-server/Makefile.am
+--- libbonobo-2.32.1.orig/activation-server/Makefile.am        2010-08-18 17:41:32.000000000 +0000
++++ libbonobo-2.32.1.fix/activation-server/Makefile.am 2013-05-06 19:08:39.411510478 +0000
+@@ -17,7 +17,6 @@
+       $(SERVER_CFLAGS)                        \
+       $(WARN_CFLAGS)                          \
+       -DSERVER_CONFDIR=\"$(sysconfdir)\"      \
+-      -DG_DISABLE_DEPRECATED                  \
+       -DG_LOG_DOMAIN=\"Bonobo-Activation-Server\" \
+       $(NULL)
+ 
+diff -ur libbonobo-2.32.1.orig/activation-server/Makefile.in libbonobo-2.32.1.fix/activation-server/Makefile.in
+--- libbonobo-2.32.1.orig/activation-server/Makefile.in        2011-04-04 12:14:14.000000000 +0000
++++ libbonobo-2.32.1.fix/activation-server/Makefile.in 2013-05-06 19:08:44.809510664 +0000
+@@ -341,7 +341,6 @@
+       $(SERVER_CFLAGS)                        \
+       $(WARN_CFLAGS)                          \
+       -DSERVER_CONFDIR=\"$(sysconfdir)\"      \
+-      -DG_DISABLE_DEPRECATED                  \
+       -DG_LOG_DOMAIN=\"Bonobo-Activation-Server\" \
+       $(NULL)
+ 
+diff -ur libbonobo-2.32.1.orig/configure.in libbonobo-2.32.1.fix/configure.in
+--- libbonobo-2.32.1.orig/configure.in 2011-04-04 12:13:53.000000000 +0000
++++ libbonobo-2.32.1.fix/configure.in  2013-05-06 19:08:28.729510232 +0000
+@@ -132,7 +132,7 @@
+ AC_SUBST(SERVER_CFLAGS)
+ 
+ if test "$enable_maintainer_mode" = "yes"; then
+-      DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES"
++      DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_SINGLE_INCLUDES"
+       AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
+ fi
+ 

diff --git a/libbonobo.spec b/libbonobo.spec
index 5f76284fab24ccf998d0161bbc98fad74ec49551..c934ad07f20c5151492231da1f162e597f0c7508 100644 (file)
--- a/libbonobo.spec
+++ b/libbonobo.spec
@@ -7,11 +7,12 @@ Summary(pl.UTF-8):    Biblioteka do łączenia dokumentów w GNOME
 Summary(pt_BR.UTF-8):  Biblioteca para documentos compostos no GNOME
 Name:          libbonobo
 Version:       2.32.1
-Release:       3
+Release:       4
 License:       LGPL v2+ (libraries), GPL v2+ (programs)
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/libbonobo/2.32/%{name}-%{version}.tar.bz2
 # Source0-md5: 27fa902d4fdf6762ee010e7053aaf77b
+Patch0:                %{name}-glib.patch
 URL:           http://www.gnome.org/
 BuildRequires: ORBit2-devel >= 1:2.14.8
 BuildRequires: autoconf >= 2.59
@@ -116,6 +117,7 @@ Dokumentacja API libbonobo.
 
 %prep
 %setup -q
+%patch0 -p1
 %{__sed} -i -e 's|/lib|/%{_lib}|g' utils/bonobo-slay.in
 
 %build