From 5bee63e182feb6f1da9da1399a19e4250af25c05 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 05:09:11 +0000 Subject: [PATCH 1/4] Initialize branch F-11 for unique --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From b2c47e81ff38051f6d59d2c52e8b96ae9df2b018 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 20 Apr 2009 07:36:58 +0000 Subject: [PATCH 2/4] - Update to latest upstream version Unbreak subclassing of UniqueApp Remove upstreamed patches --- .cvsignore | 2 +- sources | 2 +- unique-startup-id.patch | 11 ----------- unique.spec | 15 +++++++++------ 4 files changed, 11 insertions(+), 19 deletions(-) delete mode 100644 unique-startup-id.patch diff --git a/.cvsignore b/.cvsignore index e651b12..042c240 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -unique-1.0.4.tar.gz +libunique-1.0.8.tar.gz diff --git a/sources b/sources index a2df048..42d39f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6691a55b3ca0943f5824d7bdc73927da unique-1.0.4.tar.gz +8ea35a7d8da7ef2952cd79f9e1324053 libunique-1.0.8.tar.gz diff --git a/unique-startup-id.patch b/unique-startup-id.patch deleted file mode 100644 index 3f35e14..0000000 --- a/unique-startup-id.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up unique-1.0.4/unique/uniquemessage.c.startup_id unique-1.0.4/unique/uniquemessage.c ---- unique-1.0.4/unique/uniquemessage.c.startup_id 2008-12-20 14:28:52.000000000 -0500 -+++ unique-1.0.4/unique/uniquemessage.c 2008-12-20 14:29:19.000000000 -0500 -@@ -105,6 +105,7 @@ unique_message_data_copy (UniqueMessageD - } - - retval->screen = message_data->screen; -+ retval->startup_id = g_strdup (message_data->startup_id); - - return retval; - } diff --git a/unique.spec b/unique.spec index ab67584..c67cba1 100644 --- a/unique.spec +++ b/unique.spec @@ -1,14 +1,13 @@ Name: unique -Version: 1.0.4 -Release: 4%{?dist} +Version: 1.0.8 +Release: 1%{?dist} Summary: Single instance support for applications Group: System Environment/Libraries License: LGPLv2+ URL: http://www.gnome.org/~ebassi/source/ -Source0: http://www.gnome.org/~ebassi/source/unique-%{version}.tar.gz +Source0: http://www.gnome.org/~ebassi/source/libunique-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: unique-startup-id.patch BuildRequires: dbus-glib-devel BuildRequires: gnome-doc-utils >= 0.3.2 @@ -34,8 +33,7 @@ Requires: gtk2-devel Headers and libraries for Unique. %prep -%setup -q -%patch0 -p1 -b .startup-id +%setup -q -n libunique-%{?version} %build %configure --enable-gtk-doc --disable-static @@ -66,6 +64,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lib*.so %changelog +* 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 From df2b03c655f63da84df163bd2d8e40978870c7bd Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:14:40 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4b60e11..229881b 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: unique -# $Id$ +# $Id: Makefile,v 1.1 2008/05/16 15:44:28 kevin Exp $ NAME := unique SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 729285f6b81eae3a1cf2f6e41db24815b20de24c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:43:16 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 229881b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: unique -# $Id: Makefile,v 1.1 2008/05/16 15:44:28 kevin Exp $ -NAME := unique -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11