diff --git a/.gitignore b/.gitignore index 042c240..ea98144 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libunique-1.0.8.tar.gz +libunique-1.1.6.tar.bz2 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/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/libunique-1.1.6-format-security.patch b/libunique-1.1.6-format-security.patch new file mode 100644 index 0000000..5f2cc91 --- /dev/null +++ b/libunique-1.1.6-format-security.patch @@ -0,0 +1,15 @@ +--- libunique-1.1.6/tests/test-unique.c.orig 2014-05-07 11:05:02.743420865 +0100 ++++ libunique-1.1.6/tests/test-unique.c 2014-05-07 11:24:20.163336706 +0100 +@@ -82,10 +82,10 @@ + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_CLOSE, +- title); ++ "%s", title); + if (message) + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), +- message); ++ "%s", message); + + gtk_window_set_urgency_hint (GTK_WINDOW (dialog), TRUE); + diff --git a/sources b/sources index 42d39f2..e8bd3fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8ea35a7d8da7ef2952cd79f9e1324053 libunique-1.0.8.tar.gz +7955769ef31f1bc4f83446dbb3625e6d libunique-1.1.6.tar.bz2 diff --git a/unique.spec b/unique.spec index ba28551..dd09360 100644 --- a/unique.spec +++ b/unique.spec @@ -1,19 +1,27 @@ Name: unique -Version: 1.0.8 -Release: 1%{?dist} +Version: 1.1.6 +Release: 38%{?dist} Summary: Single instance support for applications -Group: System Environment/Libraries -License: LGPLv2+ +# Automatically converted from old format: LGPLv2+ - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2+ URL: http://www.gnome.org/~ebassi/source/ -Source0: http://www.gnome.org/~ebassi/source/libunique-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +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 +Patch1: fix-disable-deprecated.patch +Patch2: libunique-1.1.6-format-security.patch + +BuildRequires: make +BuildRequires: autoconf +BuildRequires: automake BuildRequires: dbus-glib-devel BuildRequires: gnome-doc-utils >= 0.3.2 BuildRequires: libtool BuildRequires: glib2-devel >= 2.12.0 BuildRequires: gtk2-devel >= 2.11.0 +BuildRequires: gtk-doc >= 1.11 %description Unique is a library for writing single instance applications, that is @@ -22,10 +30,7 @@ either exits immediately or sends a command to the running instance. %package devel 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 @@ -34,41 +39,190 @@ Headers and libraries for Unique. %prep %setup -q -n libunique-%{?version} +%patch -P0 -p1 -b .unused-but-set-variable +%patch -P1 -p1 -b .disable-deprecated +%patch -P2 -p1 -b .format-security +# fix compatibility with gtk-doc 1.26 +gtkdocize +autoreconf -fiv %build -%configure --enable-gtk-doc --disable-static +%configure --enable-gtk-doc --disable-static --enable-introspection=no --enable-maintainer-flags=no make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +find $RPM_BUILD_ROOT -type f -name "*.la" -delete -%clean -rm -rf $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -%defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README %{_libdir}/lib*.so.* %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 +* Fri Jul 17 2026 Fedora Release Engineering - 1.1.6-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 1.1.6-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 1.1.6-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 1.1.6-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Sep 04 2024 Miroslav Suchý - 1.1.6-34 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 1.1.6-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.1.6-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 1.1.6-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.1.6-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.1.6-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.1.6-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.1.6-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.1.6-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.1.6-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 1.1.6-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 1.1.6-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.1.6-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.1.6-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.1.6-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 24 2018 Merlin Mathesius - 1.1.6-19 +- Fix FTBFS by updating for compatibility with gtk-doc-1.26. + +* Thu Aug 03 2017 Fedora Release Engineering - 1.1.6-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.1.6-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.1.6-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 1.1.6-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.1.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 1.1.6-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.1.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 7 2014 Peter Robinson 1.1.6-11 +- Add patch for format-security FTBFS + +* Sun Aug 04 2013 Fedora Release Engineering - 1.1.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 1.1.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 1.1.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 1.1.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Nov 14 2011 Adam Jackson - 1.1.6-6 +- Rebuild for new libpng + +* 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 + +* Mon Feb 07 2011 Fedora Release Engineering - 1.1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Aug 23 2010 Matthias Clasen - 1.1.6-2 +- Co-own /usr/share/gtk-doc (#604419) + +* Thu Nov 12 2009 Richard Hughes - 1.1.6-1 +- Update to 1.1.4 +- Brown paper bag release + +* Thu Nov 12 2009 Richard Hughes - 1.1.4-3 +- Don't ship gir files by disabling introspection. +- BR gtk-doc + +* Thu Nov 12 2009 Richard Hughes - 1.1.4-2 +- Don't ship gir files. + +* Thu Nov 12 2009 Richard Hughes - 1.1.4-1 +- Update to 1.1.4 +- Fixes nautilus segfaulting when launched from Places or the trash applet. + +* Tue Aug 25 2009 Matthias Clasen - 1.1.2-1 +- Update to 1.1.2 + +* Sun Jul 26 2009 Fedora Release Engineering - 1.0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Apr 20 2009 Richard Hughes - 1.0.8-1 - Update to latest upstream version * Unbreak subclassing of UniqueApp * Remove upstreamed patches +* Wed Feb 25 2009 Fedora Release Engineering - 1.0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Dec 20 2008 Matthias Clasen - 1.0.4-3 +- Actually apply the patch + +* Sat Dec 20 2008 Matthias Clasen - 1.0.4-2 +- Fix a nautilus segfault + +* Mon Nov 24 2008 Richard Hughes - 1.0.4-1 +- Update to latest upstream version + * Plug a leak in UniqueMessageData + * Fix linking with --as-needed + * Do not export private functions symbols + +* Sat Nov 22 2008 Richard Hughes - 1.0.0-2 +- Fix up summary text + * Thu Jul 31 2008 Richard Hughes - 1.0.0-1 - Update to latest upstream version * First stable release