From deb796531a7e58223cc33b9e773543cd5326a5363e69599f071e0c07371282f8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 13 Oct 2010 07:55:46 +0000 Subject: [PATCH 1/3] Accepting request 50448 from home:vuntz:branches:GNOME:Factory now I'm happy too :) OBS-URL: https://build.opensuse.org/request/show/50448 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/startup-notification?expand=0&rev=13 --- startup-notification.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/startup-notification.spec b/startup-notification.spec index b8489be..4198d09 100644 --- a/startup-notification.spec +++ b/startup-notification.spec @@ -24,7 +24,7 @@ Url: http://www.freedesktop.org/wiki/Software/startup-notification License: GPLv2+ Group: System/X11/Utilities Version: 0.10 -Release: 10 +Release: 9 # NOTE: on upgrade to a new upstream version, change the Obsoletes from <= to < (here and in baselibs.conf) Summary: Reference Implementation for the Startup-Notification Protocol Source: startup-notification-%{version}.tar.bz2 From 1dabc7f0a73ae5e6f2ff922c628aa70b8c7fa1f903f808d6f7c6a7e120ce4390 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 15 Oct 2010 11:51:03 +0000 Subject: [PATCH 2/3] Accepting request 50781 from GNOME:Factory checked in (request 50781) OBS-URL: https://build.opensuse.org/request/show/50781 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/startup-notification?expand=0&rev=14 --- baselibs.conf | 4 +--- startup-notification.changes | 9 --------- startup-notification.spec | 25 ++++++------------------- 3 files changed, 7 insertions(+), 31 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 91bba4a..c3937ef 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1 @@ -libstartup-notification-1-0 - provides "startup-notification- = " - obsoletes "startup-notification- <= " +startup-notification diff --git a/startup-notification.changes b/startup-notification.changes index 0618d88..34308e1 100644 --- a/startup-notification.changes +++ b/startup-notification.changes @@ -1,12 +1,3 @@ -------------------------------------------------------------------- -Mon Oct 11 18:16:25 CEST 2010 - vuntz@opensuse.org - -- Update packaging to use the shared library packaging policy: - + Create libstartup-notification-1-0 subpackages. - + Add Provides/Obsoletes for startup-notification to - libstartup-notification-1-0 - + Update baselibs.conf accordingly. - ------------------------------------------------------------------- Thu Sep 9 23:56:27 CEST 2010 - vuntz@opensuse.org diff --git a/startup-notification.spec b/startup-notification.spec index 4198d09..f90fc62 100644 --- a/startup-notification.spec +++ b/startup-notification.spec @@ -25,7 +25,6 @@ License: GPLv2+ Group: System/X11/Utilities Version: 0.10 Release: 9 -# NOTE: on upgrade to a new upstream version, change the Obsoletes from <= to < (here and in baselibs.conf) Summary: Reference Implementation for the Startup-Notification Protocol Source: startup-notification-%{version}.tar.bz2 Source99: baselibs.conf @@ -34,33 +33,21 @@ Patch0: startup-notification-application-id.patch # PATCH-FIX-UPSTREAM startup-notification-sn-launcher-screen.patch vuntz@opensuse.org -- Taken from git, to use the screen number in sn-launcher Patch1: startup-notification-sn-launcher-screen.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -Startup-notification contains a reference implementation of the -startup-notification protocol. - -%package -n libstartup-notification-1-0 -License: GPLv2+ -Group: System/X11/Utilities -Summary: Reference Implementation for the Startup-Notification Protocol -Provides: %{name} = %{version} -# Note: we keep <= (and a rpmlint warning...) until we get a version higher than 0.10 (when this provides/obsoletes was introduced) -Obsoletes: %{name} <= %{version} # bug437293 %ifarch ppc64 Obsoletes: startup-notification-64bit %endif # -%description -n libstartup-notification-1-0 +%description Startup-notification contains a reference implementation of the startup-notification protocol. %package devel License: GPLv2+ -Summary: Include Files and Libraries mandatory for Development +Summary: Include Files and Libraries mandatory for Development. Group: Development/Libraries/GNOME -Requires: libstartup-notification-1-0 = %{version} +Requires: %{name} = %{version} glibc-devel xorg-x11-libX11-devel xorg-x11-libSM-devel xorg-x11-libICE-devel # bug437293 %ifarch ppc64 Obsoletes: startup-notification-devel-64bit @@ -84,14 +71,14 @@ make %{?jobs:-j %jobs} %makeinstall find %{buildroot} -type f -name "*.la" -delete -print -%post -n libstartup-notification-1-0 -p /sbin/ldconfig +%post -p /sbin/ldconfig -%postun -n libstartup-notification-1-0 -p /sbin/ldconfig +%postun -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT -%files -n libstartup-notification-1-0 +%files %defattr(-,root,root) %doc AUTHORS COPYING NEWS ChangeLog %{_libdir}/*.so.* From 1f38f285d4829daffda42f9f36be2a9b7f109d37827d9c83b2098be7188cb9d4 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 6 May 2011 10:04:59 +0000 Subject: [PATCH 3/3] Accepting request 69741 from home:vuntz:branches:GNOME:Factory Update to 0.11 OBS-URL: https://build.opensuse.org/request/show/69741 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/startup-notification?expand=0&rev=15 --- baselibs.conf | 4 +- startup-notification-0.10.tar.bz2 | 3 - startup-notification-0.11.tar.bz2 | 3 + startup-notification-application-id.patch | 173 ------------------ startup-notification-sn-launcher-screen.patch | 21 --- startup-notification.changes | 21 +++ startup-notification.spec | 45 +++-- 7 files changed, 52 insertions(+), 218 deletions(-) delete mode 100644 startup-notification-0.10.tar.bz2 create mode 100644 startup-notification-0.11.tar.bz2 delete mode 100644 startup-notification-application-id.patch delete mode 100644 startup-notification-sn-launcher-screen.patch diff --git a/baselibs.conf b/baselibs.conf index c3937ef..63da43a 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1,3 @@ -startup-notification +libstartup-notification-1-0 + provides "startup-notification- = " + obsoletes "startup-notification- < " diff --git a/startup-notification-0.10.tar.bz2 b/startup-notification-0.10.tar.bz2 deleted file mode 100644 index e0f0dac..0000000 --- a/startup-notification-0.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25b3585682b14aa1528d43c8d6c9180493bf8878f0a2ff248a37d3d96c5cf9a4 -size 248651 diff --git a/startup-notification-0.11.tar.bz2 b/startup-notification-0.11.tar.bz2 new file mode 100644 index 0000000..89e5099 --- /dev/null +++ b/startup-notification-0.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dff81545e540dba20f489fc03c0739bb5e195e2da2e4467594342f100a8cecd8 +size 276743 diff --git a/startup-notification-application-id.patch b/startup-notification-application-id.patch deleted file mode 100644 index 01ae731..0000000 --- a/startup-notification-application-id.patch +++ /dev/null @@ -1,173 +0,0 @@ -From 1b14d72976741afc33d9f7fac22e20b831e47e1f Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Thu, 25 Feb 2010 20:33:54 +0000 -Subject: Support APPLICATION_ID key - -For moving GNOME to an application-based system, it's useful if -launcher systems say which .desktop file they're launching, so -that we can show it as the current focus even while a launch is -in progress. - -Signed-off-by: Julien Danjou ---- -diff --git a/doc/startup-notification.txt b/doc/startup-notification.txt -index cf5b250..dd1ccc2 100644 ---- a/doc/startup-notification.txt -+++ b/doc/startup-notification.txt -@@ -300,6 +300,16 @@ The following keys may be provided optionally in either a "new" or a - have their window mapped on the desktop specified by - the value of DESKTOP. - -+ APPLICATION_ID -+ -+ When launching an application using a .desktop file from -+ the normal application paths (see desktop file specification), -+ this should be basename of the .desktop file. -+ For example: "foo.desktop". -+ -+ When launching a .desktop file NOT in the paths, this should -+ be an absolute path to the .desktop file. -+ - Some details of the startup sequence: - - - "new" and "change" messages are sent by the launcher code -diff --git a/libsn/sn-launcher.c b/libsn/sn-launcher.c -index 21344cd..089b5c2 100644 ---- a/libsn/sn-launcher.c -+++ b/libsn/sn-launcher.c -@@ -44,6 +44,7 @@ struct SnLauncherContext - char *wmclass; - char *binary_name; - char *icon_name; -+ char *application_id; - struct timeval initiation_time; - unsigned int completed : 1; - unsigned int canceled : 1; -@@ -121,6 +122,7 @@ sn_launcher_context_unref (SnLauncherContext *context) - sn_free (context->wmclass); - sn_free (context->binary_name); - sn_free (context->icon_name); -+ sn_free (context->application_id); - - sn_display_unref (context->display); - sn_free (context); -@@ -266,9 +268,16 @@ sn_launcher_context_initiate (SnLauncherContext *context, - values[i] = context->icon_name; - ++i; - } -- -+ -+ if (context->application_id != NULL) -+ { -+ names[i] = "APPLICATION_ID"; -+ values[i] = context->application_id; -+ ++i; -+ } -+ - assert (i < MAX_PROPS); -- -+ - names[i] = NULL; - values[i] = NULL; - -@@ -433,6 +442,16 @@ sn_launcher_context_set_icon_name (SnLauncherContext *context, - } - - void -+sn_launcher_set_application_id (SnLauncherContext *context, -+ const char *desktop_file) -+{ -+ WARN_ALREADY_INITIATED (context); -+ -+ sn_free (context->application_id); -+ context->application_id = sn_internal_strdup (desktop_file); -+} -+ -+void - sn_launcher_context_set_extra_property (SnLauncherContext *context, - const char *name, - const char *value) -diff --git a/libsn/sn-launcher.h b/libsn/sn-launcher.h -index f88f11c..9cd34fd 100644 ---- a/libsn/sn-launcher.h -+++ b/libsn/sn-launcher.h -@@ -61,6 +61,8 @@ void sn_launcher_context_set_binary_name (SnLauncherContext *context, - const char *name); - void sn_launcher_context_set_icon_name (SnLauncherContext *context, - const char *name); -+void sn_launcher_context_set_application_id (SnLauncherContext *context, -+ const char *desktop_file); - - void sn_launcher_context_set_extra_property (SnLauncherContext *context, - const char *name, -diff --git a/libsn/sn-monitor.c b/libsn/sn-monitor.c -index 223473a..035d523 100644 ---- a/libsn/sn-monitor.c -+++ b/libsn/sn-monitor.c -@@ -66,7 +66,8 @@ struct SnStartupSequence - Time timestamp; - - char *binary_name; -- char *icon_name; -+ char *icon_name; -+ char *application_id; - - unsigned int completed : 1; - unsigned int canceled : 1; -@@ -269,7 +270,8 @@ sn_startup_sequence_unref (SnStartupSequence *sequence) - sn_free (sequence->wmclass); - sn_free (sequence->binary_name); - sn_free (sequence->icon_name); -- -+ sn_free (sequence->application_id); -+ - sn_display_unref (sequence->display); - sn_free (sequence); - } -@@ -337,6 +339,12 @@ sn_startup_sequence_get_icon_name (SnStartupSequence *sequence) - return sequence->icon_name; - } - -+const char* -+sn_startup_sequence_get_application_id (SnStartupSequence *sequence) -+{ -+ return sequence->application_id; -+} -+ - int - sn_startup_sequence_get_screen (SnStartupSequence *sequence) - { -@@ -805,10 +813,18 @@ xmessage_func (SnDisplay *display, - changed = TRUE; - } - } -+ else if (strcmp (names[i], "APPLICATION_ID") == 0) -+ { -+ if (sequence->application_id == NULL) -+ { -+ sequence->application_id = sn_internal_strdup (values[i]); -+ changed = TRUE; -+ } -+ } - else if (strcmp (names[i], "DESKTOP") == 0) - { - int workspace; -- -+ - workspace = sn_internal_string_to_ulong (values[i]); - - sequence->workspace = workspace; -diff --git a/libsn/sn-monitor.h b/libsn/sn-monitor.h -index 15a38d7..b58581f 100644 ---- a/libsn/sn-monitor.h -+++ b/libsn/sn-monitor.h -@@ -73,6 +73,7 @@ Time sn_startup_sequence_get_timestamp (SnStartupSequence *se - const char* sn_startup_sequence_get_wmclass (SnStartupSequence *sequence); - const char* sn_startup_sequence_get_binary_name (SnStartupSequence *sequence); - const char* sn_startup_sequence_get_icon_name (SnStartupSequence *sequence); -+const char* sn_startup_sequence_get_application_id (SnStartupSequence *sequence); - int sn_startup_sequence_get_screen (SnStartupSequence *sequence); - - void sn_startup_sequence_get_initiated_time (SnStartupSequence *sequence, --- -cgit v0.8.3-6-g21f6 diff --git a/startup-notification-sn-launcher-screen.patch b/startup-notification-sn-launcher-screen.patch deleted file mode 100644 index 0866f97..0000000 --- a/startup-notification-sn-launcher-screen.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 76ede84816d187e3c6ce11ec03dbe9167f5738dc Mon Sep 17 00:00:00 2001 -From: Julien Danjou -Date: Mon, 24 May 2010 12:25:02 +0000 -Subject: Fix sn-launcher not using screen number - -Signed-off-by: Julien Danjou ---- -diff --git a/libsn/sn-launcher.c b/libsn/sn-launcher.c -index 089b5c2..f1d5e99 100644 ---- a/libsn/sn-launcher.c -+++ b/libsn/sn-launcher.c -@@ -78,6 +78,7 @@ sn_launcher_context_new (SnDisplay *display, - - context->refcount = 1; - context->display = display; -+ context->screen = screen; - sn_display_ref (context->display); - - context->workspace = -1; --- -cgit v0.8.3-6-g21f6 diff --git a/startup-notification.changes b/startup-notification.changes index 34308e1..d672caa 100644 --- a/startup-notification.changes +++ b/startup-notification.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Fri May 6 10:30:24 CEST 2011 - vuntz@opensuse.org + +- Update to version 0.11: + + Remove Xlib support, use only xcb and x11-xcb + + Support APPLICATION_ID key +- Drop startup-notification-application-id.patch and + startup-notification-sn-launcher-screen.patch: fixed upstream. +- Fix License tags: the librarys is LGPLv2+, not GPLv2+. +- Change startup-notification Obsoletes from <= to < now that we + have a new upstream version. + +------------------------------------------------------------------- +Mon Oct 11 18:16:25 CEST 2010 - vuntz@opensuse.org + +- Update packaging to use the shared library packaging policy: + + Create libstartup-notification-1-0 subpackages. + + Add Provides/Obsoletes for startup-notification to + libstartup-notification-1-0 + + Update baselibs.conf accordingly. + ------------------------------------------------------------------- Thu Sep 9 23:56:27 CEST 2010 - vuntz@opensuse.org diff --git a/startup-notification.spec b/startup-notification.spec index f90fc62..3c1b560 100644 --- a/startup-notification.spec +++ b/startup-notification.spec @@ -1,5 +1,5 @@ # -# spec file for package startup-notification (Version 0.10) +# spec file for package startup-notification (Version 0.11) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,35 +19,42 @@ Name: startup-notification -BuildRequires: xorg-x11-devel -Url: http://www.freedesktop.org/wiki/Software/startup-notification -License: GPLv2+ -Group: System/X11/Utilities -Version: 0.10 -Release: 9 +Version: 0.11 +Release: 1 Summary: Reference Implementation for the Startup-Notification Protocol +License: LGPLv2+ +Group: System/X11/Utilities +Url: http://www.freedesktop.org/wiki/Software/startup-notification Source: startup-notification-%{version}.tar.bz2 Source99: baselibs.conf -# PATCH-FEATURE-UPSTREAM startup-notification-application-id.patch vuntz@opensuse.org -- Add git commit to support APPLICATION_ID. This is useful for gnome-shell. -Patch0: startup-notification-application-id.patch -# PATCH-FIX-UPSTREAM startup-notification-sn-launcher-screen.patch vuntz@opensuse.org -- Taken from git, to use the screen number in sn-launcher -Patch1: startup-notification-sn-launcher-screen.patch +BuildRequires: xorg-x11-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Startup-notification contains a reference implementation of the +startup-notification protocol. + +%package -n libstartup-notification-1-0 +License: LGPLv2+ +Group: System/X11/Utilities +Summary: Reference Implementation for the Startup-Notification Protocol +Provides: %{name} = %{version} +Obsoletes: %{name} < %{version} # bug437293 %ifarch ppc64 Obsoletes: startup-notification-64bit %endif # -%description +%description -n libstartup-notification-1-0 Startup-notification contains a reference implementation of the startup-notification protocol. %package devel -License: GPLv2+ -Summary: Include Files and Libraries mandatory for Development. +License: LGPLv2+ +Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/GNOME -Requires: %{name} = %{version} glibc-devel xorg-x11-libX11-devel xorg-x11-libSM-devel xorg-x11-libICE-devel +Requires: libstartup-notification-1-0 = %{version} # bug437293 %ifarch ppc64 Obsoletes: startup-notification-devel-64bit @@ -60,8 +67,6 @@ to develop applications that require these. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %configure --disable-static @@ -71,14 +76,14 @@ make %{?jobs:-j %jobs} %makeinstall find %{buildroot} -type f -name "*.la" -delete -print -%post -p /sbin/ldconfig +%post -n libstartup-notification-1-0 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libstartup-notification-1-0 -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT -%files +%files -n libstartup-notification-1-0 %defattr(-,root,root) %doc AUTHORS COPYING NEWS ChangeLog %{_libdir}/*.so.*