dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-unique-1.0.0.tar.gz

.gitignore

@@ -0,0 +1 @@
+libunique-1.0.8.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: unique
-# $Id$
-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
-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)

sources

@@ -1 +1 @@
-fc6dfeca0ba84bc0bc557f17238e58cc  unique-1.0.0.tar.gz
+8ea35a7d8da7ef2952cd79f9e1324053  libunique-1.0.8.tar.gz

unique-compile-fix1.patch

@@ -1,13 +0,0 @@
-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)

unique-compile-fix2.patch

@@ -1,30 +0,0 @@
-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");

unique.spec

@@ -1,12 +1,12 @@
 Name:           unique
-Version:        1.0.0
+Version:        1.0.8
 Release:        1%{?dist}
-Summary:        Unique instance support for applications
+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)
 
 BuildRequires:  dbus-glib-devel
@@ -33,7 +33,7 @@ Requires: gtk2-devel
 Headers and libraries for Unique.
 
 %prep
-%setup -q
+%setup -q -n libunique-%{?version}
 
 %build
 %configure --enable-gtk-doc --disable-static
@@ -64,6 +64,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.so
 
 %changelog
+* 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
+
 * Thu Jul 31 2008 Richard Hughes  <rhughes@redhat.com> - 1.0.0-1
 - Update to latest upstream version
  * First stable release