From 6a2eb6b63008bca1d2a6b5106d7325c47d5d1c966dd62dbe78076cc6f47da322 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 15 Oct 2010 14:20:56 +0000
Subject: [PATCH] Accepting request 50762 from GNOME:Factory

checked in (request 50762)

OBS-URL: https://build.opensuse.org/request/show/50762
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libsigc++2?expand=0&rev=22
---
 baselibs.conf      |  4 +---
 libsigc++2.changes |  8 --------
 libsigc++2.spec    | 31 +++++++------------------------
 3 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/baselibs.conf b/baselibs.conf
index 9ceddba..057b887 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,3 +1 @@
-libsigc-2_0-0
-  provides "libsigc++2-<targettype> = <version>"
-  obsoletes "libsigc++2-<targettype> <= <version>"
+libsigc++2
diff --git a/libsigc++2.changes b/libsigc++2.changes
index 939164a..acceabe 100644
--- a/libsigc++2.changes
+++ b/libsigc++2.changes
@@ -1,11 +1,3 @@
--------------------------------------------------------------------
-Mon Oct 11 19:53:12 CEST 2010 - vuntz@opensuse.org
-
-- Update packaging to use the shared library packaging policy:
-  + Create libsigc-2_0-0 subpackage.
-  + Add Provides/Obsoletes for libsigc++2 to libsigc-2_0-0.
-  + Update baselibs.conf accordingly.
-
 -------------------------------------------------------------------
 Fri Jul 23 12:51:34 CEST 2010 - vuntz@opensuse.org
 
diff --git a/libsigc++2.spec b/libsigc++2.spec
index c10fee1..0f69408 100644
--- a/libsigc++2.spec
+++ b/libsigc++2.spec
@@ -23,8 +23,7 @@ Name:           libsigc++2
 BuildRequires:  gcc-c++ pkg-config
 Version:        2.2.8
 Release:        1
-# NOTE: on upgrade to a new upstream version, change the Obsoletes from <= to < (here and in baselibs.conf)
-Group:          System/Libraries
+Group:          Development/Libraries/C and C++
 License:        LGPLv2.1+
 Summary:        Typesafe Signal Framework for C++
 Url:            http://libsigc.sourceforge.net/
@@ -41,27 +40,11 @@ callback to a class method, function, or function object. It contains
 adaptor classes for connection of dissimilar callbacks and has an ease
 of use unmatched by other C++ callback libraries.
 
-%package -n libsigc-2_0-0
-License:        LGPLv2.1+
-Group:          System/Libraries
-Summary:        Typesafe Signal Framework for C++
-Provides:       %{name} = %{version}
-# Note: we keep <= (and a rpmlint warning...) until we get a version higher than 2.2.8 (when this provides/obsoletes was introduced)
-Obsoletes:      %{name} <= %{version}
-
-%description -n libsigc-2_0-0
-This library implements a full callback system for use in widget
-libraries, abstract interfaces, and general programming. It is the most
-complete library of its kind with the ablity to connect an abstract
-callback to a class method, function, or function object. It contains
-adaptor classes for connection of dissimilar callbacks and has an ease
-of use unmatched by other C++ callback libraries.
-
 %package devel
 License:        LGPLv2.1+
 Group:          Development/Libraries/C and C++
 Summary:        Typesafe Signal Framework for C++
-Requires:       libsigc-2_0-0 = %{version} libstdc++-devel
+Requires:       %{name} = %{version} libstdc++-devel
 
 %description devel
 This library implements a full callback system for use in widget
@@ -92,18 +75,18 @@ rm -f %{buildroot}%{_libdir}/*.la
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n libsigc-2_0-0 -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun -n libsigc-2_0-0 -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
-%files -n libsigc-2_0-0
+%files
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
-%{_libdir}/libsigc-2.0.so.*
+%{_libdir}/*.so.*
 
 %files devel
 %defattr (-, root, root)
-%{_libdir}/libsigc-2.0.so
+%{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/sigc++-2.0
 %{_includedir}/sigc++-2.0/