From 51e65e37329d6ddcec2d198255e8e255b2a5ab1f27656de24068ffc116cbe555 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 15 Oct 2010 11:51:04 +0000 Subject: [PATCH] Accepting request 50781 from GNOME:Factory Copy from GNOME:Factory/startup-notification based on submit request 50781 from user vuntz OBS-URL: https://build.opensuse.org/request/show/50781 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/startup-notification?expand=0&rev=14 --- baselibs.conf | 4 +++- startup-notification.changes | 9 +++++++++ startup-notification.spec | 27 ++++++++++++++++++++------- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index c3937ef..91bba4a 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.changes b/startup-notification.changes index 34308e1..0618d88 100644 --- a/startup-notification.changes +++ b/startup-notification.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +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..b8489be 100644 --- a/startup-notification.spec +++ b/startup-notification.spec @@ -24,7 +24,8 @@ Url: http://www.freedesktop.org/wiki/Software/startup-notification License: GPLv2+ Group: System/X11/Utilities Version: 0.10 -Release: 9 +Release: 10 +# 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 @@ -33,21 +34,33 @@ 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 +%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. +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 @@ -71,14 +84,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.*