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

@@ -1,3 +1 @@
-libstartup-notification-1-0
+startup-notification
-  provides "startup-notification-<targettype> = <version>"
-  obsoletes "startup-notification-<targettype> <= <version>"

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
 

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.*