[unique/f15] Fix compile. Resolves: #716099

[Richard Hughes]

commit 707d8afb94984e47e545b040ba2f1b2836613d51
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Jul 6 10:40:17 2011 +0100

    Fix compile.
    Resolves: #716099

 fix-unused-but-set-variable.patch |   29 +++++++++++++++++++++++++++++
 unique.spec                       |   10 +++++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/fix-unused-but-set-variable.patch b/fix-unused-but-set-variable.patch
new file mode 100644
index 0000000..e0aa1a1
--- /dev/null
+++ b/fix-unused-but-set-variable.patch
@@ -0,0 +1,29 @@
+diff -urNp libunique-1.1.6.old/unique/dbus/uniquebackend-dbus.c libunique-1.1.6/unique/dbus/uniquebackend-dbus.c
+--- libunique-1.1.6.old/unique/dbus/uniquebackend-dbus.c	2011-07-06 10:30:49.712128019 +0100
++++ libunique-1.1.6/unique/dbus/uniquebackend-dbus.c	2011-07-06 10:32:11.026127998 +0100
+@@ -84,7 +84,6 @@ unique_backend_dbus_register_proxy (Uniq
+ static gboolean
+ unique_backend_dbus_request_name (UniqueBackend *backend)
+ {
+-  UniqueBackendDBus *backend_dbus;
+   const gchar *name;
+   DBusGConnection *connection;
+   DBusGProxy *proxy;
+@@ -97,8 +96,6 @@ unique_backend_dbus_request_name (Unique
+   if (!connection)
+     return FALSE;
+ 
+-  backend_dbus = UNIQUE_BACKEND_DBUS (backend);
+-
+   retval = TRUE;
+   name = unique_backend_get_name (backend);
+   g_assert (name != NULL);
+@@ -207,7 +204,7 @@ unique_backend_dbus_send_message (Unique
+                                         cmd, data, time_,
+                                         &resp,
+                                         &error);
+-  if (error)
++  if (!res && error)
+     {
+       g_warning ("Error while sending message: %s", error->message);
+       g_error_free (error);
diff --git a/unique.spec b/unique.spec
index c0b131c..bae152d 100644
--- a/unique.spec
+++ b/unique.spec
@@ -1,6 +1,6 @@
 Name:           unique
 Version:        1.1.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Single instance support for applications
 
 Group:          System Environment/Libraries
@@ -8,6 +8,9 @@ License:        LGPLv2+
 URL:            http://www.gnome.org/~ebassi/source/
 Source0:        http://download.gnome.org/sources/libunique/1.1/libunique-%{version}.tar.bz2
 
+# Fix build -- upstream dead (replaced with GtkApplication)
+Patch0:    fix-unused-but-set-variable.patch
+
 BuildRequires:  dbus-glib-devel
 BuildRequires:  gnome-doc-utils >= 0.3.2
 BuildRequires:  libtool
@@ -32,6 +35,7 @@ Headers and libraries for Unique.
 
 %prep
 %setup -q -n libunique-%{?version}
+%patch0 -p1 -b .unused-but-set-variable
 
 %build
 %configure --enable-gtk-doc --disable-static --enable-introspection=no
@@ -58,6 +62,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_libdir}/lib*.so
 
 %changelog
+* Wed Jul 06 2011 Richard Hughes  <rhughes at redhat.com> - 1.1.6-4
+- Fix compile.
+- Resolves: #716099
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild