diff --git a/ORBit2-allow-deprecated.patch b/ORBit2-allow-deprecated.patch new file mode 100644 index 0000000..25215f6 --- /dev/null +++ b/ORBit2-allow-deprecated.patch @@ -0,0 +1,23 @@ +--- ORBit2-2.14.19/linc2/src/Makefile.am.depr 2013-03-15 09:24:45.384143557 -0400 ++++ ORBit2-2.14.19/linc2/src/Makefile.am 2013-03-15 09:24:55.172144088 -0400 +@@ -12,8 +12,7 @@ + -I$(top_builddir)/linc2/include \ + -I$(top_srcdir)/linc2/include \ + $(LINC_CFLAGS) \ +- $(WARN_CFLAGS) \ +- -DG_DISABLE_DEPRECATED ++ $(WARN_CFLAGS) + + if OS_WIN32 + else +--- ORBit2-2.14.19/linc2/src/Makefile.in.depr 2013-03-15 09:24:45.943143588 -0400 ++++ ORBit2-2.14.19/linc2/src/Makefile.in 2013-03-15 09:25:08.333144801 -0400 +@@ -244,7 +244,7 @@ + # -I$(top_srcdir)/include + INCLUDES = -I$(top_builddir)/linc2/include \ + -I$(top_srcdir)/linc2/include $(LINC_CFLAGS) $(WARN_CFLAGS) \ +- -DG_DISABLE_DEPRECATED $(am__append_1) ++ $(am__append_1) + liblinc_la_SOURCES = \ + linc.c \ + linc-connection.c \ diff --git a/ORBit2.spec b/ORBit2.spec index b5c6f96..0a77d80 100644 --- a/ORBit2.spec +++ b/ORBit2.spec @@ -4,7 +4,7 @@ Summary: A high-performance CORBA Object Request Broker Name: ORBit2 Version: 2.14.19 -Release: 7%{?dist} +Release: 8%{?dist} #VCS: git:git://git.gnome.org/ORBit2 Source: http://download.gnome.org/sources/ORBit2/2.14/%{name}-%{version}.tar.bz2 Group: System Environment/Daemons @@ -22,6 +22,7 @@ Patch0: ORBit2-2.14.3-multilib.patch # handle ref leaks in the a11y stack more gracefully Patch1: ORBit2-2.14.3-ref-leaks.patch Patch2: ORBit2-make-j-safety.patch +Patch3: ORBit2-allow-deprecated.patch %description ORBit is a high-performance CORBA (Common Object Request Broker @@ -62,6 +63,7 @@ write such programs, you'll also need to install the ORBIT package. %patch0 -p1 -b .multilib %patch1 -p1 -b .ref-leaks %patch2 -p1 -b .make-j +%patch3 -p1 -b .deprecated %build ## the shipped libtool is broken wrt. multilib @@ -133,6 +135,9 @@ EOF %{_datadir}/gtk-doc %changelog +* Fri Mar 15 2013 Dan Winship - 2.14.19-8 +- Fix FTBFS by not trying to use G_DISABLE_DEPRECATED any more (#913861) + * Wed Feb 13 2013 Fedora Release Engineering - 2.14.19-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild