Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Richard Hughes
35d4db9818 Fix compile.
Resolves: #716099
2011-07-06 11:46:16 +01:00
Matthias Clasen
786575f2e7 drop gtk-doc dep 2010-08-23 19:30:38 -04:00
2 changed files with 42 additions and 9 deletions

View file

@ -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);

View file

@ -1,13 +1,15 @@
Name: unique
Version: 1.1.6
Release: 1%{?dist}
Release: 3%{?dist}
Summary: Single instance support for applications
Group: System Environment/Libraries
License: LGPLv2+
URL: http://www.gnome.org/~ebassi/source/
Source0: http://download.gnome.org/sources/libunique/1.1/libunique-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# 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
@ -25,8 +27,6 @@ either exits immediately or sends a command to the running instance.
Summary: Libraries and headers for Unique
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
Requires: gtk-doc
Requires: dbus-glib-devel
Requires: gtk2-devel
@ -35,19 +35,16 @@ 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
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@ -59,12 +56,19 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root,-)
%doc %{_datadir}/gtk-doc/html/unique/
%doc %{_datadir}/gtk-doc
%{_includedir}/unique-1.0/
%{_libdir}/pkgconfig/*
%{_libdir}/lib*.so
%changelog
* Wed Jul 06 2011 Richard Hughes <rhughes@redhat.com> - 1.1.6-3
- Fix compile.
- Resolves: #716099
* Mon Aug 23 2010 Matthias Clasen <mclasen@redhat.com> - 1.1.6-2
- Co-own /usr/share/gtk-doc (#604419)
* Thu Nov 12 2009 Richard Hughes <rhughes@redhat.com> - 1.1.6-1
- Update to 1.1.4
- Brown paper bag release