dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-29 14:43:15 +00:00 · 2009-11-26 01:14:41 +00:00 · 2008-05-16 16:05:08 +00:00 · 2008-05-16 15:44:41 +00:00
8 changed files with 72 additions and 264 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-libunique-1.1.6.tar.bz2
+unique-0.9.4.tar.gz
--- a/fix-disable-deprecated.patch
+++ b/fix-disable-deprecated.patch
@ -1,30 +0,0 @@
-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)
- 
--- a/fix-unused-but-set-variable.patch
+++ b/fix-unused-but-set-variable.patch
@ -1,29 +0,0 @@
-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);
--- a/libunique-1.1.6-format-security.patch
+++ b/libunique-1.1.6-format-security.patch
@ -1,15 +0,0 @@
--- 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);
- 
--- a/2
+++ b/2
@ -1 +1 @@
-7955769ef31f1bc4f83446dbb3625e6d  libunique-1.1.6.tar.bz2
+c10d16db95275389d3361a8a023025d2  unique-0.9.4.tar.gz
--- a/unique-compile-fix1.patch
+++ b/unique-compile-fix1.patch
@ -0,0 +1,13 @@
+diff --git a/unique/bacon/uniquemessage-bacon.c b/unique/bacon/uniquemessage-bacon.c
+index 3893e9f..ac52f21 100644
+--- a/unique/bacon/uniquemessage-bacon.c
+++ b/unique/bacon/uniquemessage-bacon.c
+@@ -100,7 +100,7 @@ unique_message_data_unpack (UniqueApp   *app,
+   gchar *buf;
+   GdkDisplay *display;
+   gint screen_n;
+-  UniqueMessageData *message_data;
+  UniqueMessageData *message_data = NULL;
+ 
+   blocks = g_strsplit (data, "\t", 6);
+   if (g_strv_length (blocks) != 6)
--- a/unique-compile-fix2.patch
+++ b/unique-compile-fix2.patch
@ -0,0 +1,30 @@
+diff --git a/tests/test-unique.c b/tests/test-unique.c
+index eec69fd..cdf8682 100644
+--- a/tests/test-unique.c
+++ b/tests/test-unique.c
+@@ -39,7 +39,8 @@ app_message_cb (UniqueApp         *app,
+                 gpointer           user_data)
+ {
+   GtkWidget *dialog;
+-  gchar *message, *title;
+  gchar *message = NULL;
+  gchar *title = NULL;
+   GdkScreen *screen;
+   const gchar *startup_id;
+ 
+@@ -55,7 +56,6 @@ app_message_cb (UniqueApp         *app,
+     {
+     case UNIQUE_NEW:
+       title = g_strdup ("Received the NEW command");
+-      message = NULL;
+       break;
+     case UNIQUE_OPEN:
+       {
+@@ -77,7 +77,6 @@ app_message_cb (UniqueApp         *app,
+       break;
+     case UNIQUE_ACTIVATE:
+       title = g_strdup ("Received the ACTIVATE command");
+-      message = NULL;
+       break;
+     case COMMAND_FOO:
+       title = g_strdup ("Received the FOO command");
--- a/unique.spec
+++ b/unique.spec
@ -1,27 +1,21 @@
 Name:           unique
-Version:        1.1.6
-Release:        38%{?dist}
-Summary:        Single instance support for applications
+Version:        0.9.4
+Release:        5%{?dist}
+Summary:        Unique instance support for applications

-# Automatically converted from old format: LGPLv2+ - review is highly recommended.
-License:        LicenseRef-Callaway-LGPLv2+
+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
+Source0:        http://www.gnome.org/~ebassi/source/unique-%{version}.tar.gz
+Patch0:         unique-compile-fix1.patch
+Patch1:         unique-compile-fix2.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

-# 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
@ -30,7 +24,10 @@ 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

@ -38,197 +35,39 @@ Requires: gtk2-devel
 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
+%setup -q
+%patch0 -p1
+%patch1 -p1

 %build
-%configure --enable-gtk-doc --disable-static --enable-introspection=no --enable-maintainer-flags=no
+%configure --enable-gtk-doc --disable-static
 make %{?_smp_mflags}

 %install
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -delete
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

-%ldconfig_scriptlets
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig

 %files
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
 %{_libdir}/lib*.so.*

 %files devel
-%doc %{_datadir}/gtk-doc
+%defattr(-,root,root,-)
+%doc %{_datadir}/gtk-doc/html/unique/
 %{_includedir}/unique-1.0/
 %{_libdir}/pkgconfig/*
 %{_libdir}/lib*.so

 %changelog
-* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-38
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-37
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 1.1.6-34
- convert license to SPDX
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jan 24 2018 Merlin Mathesius <mmathesi@redhat.com> - 1.1.6-19
- Fix FTBFS by updating for compatibility with gtk-doc-1.26.
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.6-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.6-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.6-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.6-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Wed May  7 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.1.6-11
- Add patch for format-security FTBFS
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.6-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.6-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.6-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Nov 14 2011 Adam Jackson <ajax@redhat.com> - 1.1.6-6
- Rebuild for new libpng
-
-* Wed Jul 06 2011 Richard Hughes  <rhughes@redhat.com> - 1.1.6-5
- Fix compile harder.
-
-* Wed Jul 06 2011 Richard Hughes  <rhughes@redhat.com> - 1.1.6-4
- Fix compile.
- Resolves: #716099
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* 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
-
-* Thu Nov 12 2009 Richard Hughes  <rhughes@redhat.com> - 1.1.4-3
- Don't ship gir files by disabling introspection.
- BR gtk-doc
-
-* Thu Nov 12 2009 Richard Hughes  <rhughes@redhat.com> - 1.1.4-2
- Don't ship gir files.
-
-* Thu Nov 12 2009 Richard Hughes  <rhughes@redhat.com> - 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 <mclasen@redhatcom> - 1.1.2-1
- Update to 1.1.2
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Apr 20 2009 Richard Hughes  <rhughes@redhat.com> - 1.0.8-1
- Update to latest upstream version
- * Unbreak subclassing of UniqueApp
- * Remove upstreamed patches
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Dec 20 2008 Matthias Clasen  <mclasen@redhat.com> - 1.0.4-3
- Actually apply the patch
-
-* Sat Dec 20 2008 Matthias Clasen  <mclasen@redhat.com> - 1.0.4-2
- Fix a nautilus segfault
-
-* Mon Nov 24 2008 Richard Hughes  <rhughes@redhat.com> - 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  <rhughes@redhat.com> - 1.0.0-2
- Fix up summary text
-
-* Thu Jul 31 2008 Richard Hughes  <rhughes@redhat.com> - 1.0.0-1
- Update to latest upstream version
- * First stable release
- * API is frozen
- * D-Bus and socket backends supported
-
 * Fri May 16 2008 Richard Hughes  <rhughes@redhat.com> - 0.9.4-5
 - More updates to the spec file from Dan Horak, rh#446407
Author	SHA1	Message	Date
Fedora Release Engineering	ad0494ff8a	dist-git conversion	2010-07-29 14:43:15 +00:00
Bill Nottingham	ab2b450f77	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:14:41 +00:00
Richard Hughes	43ec8e733a	* empty log message *	2008-05-16 16:05:08 +00:00
Kevin Fenzi	9b0ac6f9c0	Initialize branch F-9 for unique	2008-05-16 15:44:41 +00:00