diff --git a/fix-disable-deprecated.patch b/fix-disable-deprecated.patch new file mode 100644 index 0000000..c07f98c --- /dev/null +++ b/fix-disable-deprecated.patch @@ -0,0 +1,30 @@ +diff -urNp libunique-1.1.6.old/unique/Makefile.am libunique-1.1.6/unique/Makefile.am +--- libunique-1.1.6.old/unique/Makefile.am 2011-07-06 10:54:38.403127656 +0100 ++++ libunique-1.1.6/unique/Makefile.am 2011-07-06 10:55:00.354127659 +0100 +@@ -19,11 +19,8 @@ INCLUDES = -I$(top_srcdir) + AM_CPPFLAGS = \ + -DG_DISABLE_SINGLE_INCLUDES \ + -DGTK_DISABLE_SINGLE_INCLUDES \ +- -DG_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED \ + -DG_LOG_DOMAIN=\"Unique\" \ + -DPREFIX=\""$(prefix)"\" \ +- $(DISABLE_DEPRECATED_FLAGS) \ + $(UNIQUE_DEBUG_CFLAGS) \ + $(NULL) + +diff -urNp libunique-1.1.6.old/unique/Makefile.in libunique-1.1.6/unique/Makefile.in +--- libunique-1.1.6.old/unique/Makefile.in 2011-07-06 11:01:36.306127549 +0100 ++++ libunique-1.1.6/unique/Makefile.in 2011-07-06 11:01:58.311127546 +0100 +@@ -394,11 +394,8 @@ INCLUDES = -I$(top_srcdir) + AM_CPPFLAGS = \ + -DG_DISABLE_SINGLE_INCLUDES \ + -DGTK_DISABLE_SINGLE_INCLUDES \ +- -DG_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED \ + -DG_LOG_DOMAIN=\"Unique\" \ + -DPREFIX=\""$(prefix)"\" \ +- $(DISABLE_DEPRECATED_FLAGS) \ + $(UNIQUE_DEBUG_CFLAGS) \ + $(NULL) + diff --git a/unique.spec b/unique.spec index bae152d..85a32c2 100644 --- a/unique.spec +++ b/unique.spec @@ -1,6 +1,6 @@ Name: unique Version: 1.1.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Single instance support for applications Group: System Environment/Libraries @@ -10,6 +10,7 @@ Source0: http://download.gnome.org/sources/libunique/1.1/libunique-%{vers # Fix build -- upstream dead (replaced with GtkApplication) Patch0: fix-unused-but-set-variable.patch +Patch1: fix-disable-deprecated.patch BuildRequires: dbus-glib-devel BuildRequires: gnome-doc-utils >= 0.3.2 @@ -36,9 +37,10 @@ Headers and libraries for Unique. %prep %setup -q -n libunique-%{?version} %patch0 -p1 -b .unused-but-set-variable +%patch1 -p1 -b .disable-deprecated %build -%configure --enable-gtk-doc --disable-static --enable-introspection=no +%configure --enable-gtk-doc --disable-static --enable-introspection=no --enable-maintainer-flags=no make %{?_smp_mflags} %install @@ -62,6 +64,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/lib*.so %changelog +* Wed Jul 06 2011 Richard Hughes - 1.1.6-5 +- Fix compile harder. + * Wed Jul 06 2011 Richard Hughes - 1.1.6-4 - Fix compile. - Resolves: #716099