Accepting request 64620 from home:namtrac:branches:GNOME:Factory

Thanks for the fix. Will forward it to Factory for inclusion.

OBS-URL: https://build.opensuse.org/request/show/64620
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libsigc++2?expand=0&rev=23

baselibs.conf

@@ -1 +1,3 @@
-libsigc++2
+libsigc-2_0-0
+  provides "libsigc++2-<targettype> = <version>"
+  obsoletes "libsigc++2-<targettype> <= <version>"

libsigc++2-gcc46.patch

@@ -0,0 +1,20 @@
+commit faabe1f90c142a5ea836884a04c0eef250e69f94
+Author: Kalev Lember <kalev@smartlink.ee>
+Date:   Fri Feb 4 12:17:05 2011 +0200
+
+    Fix the build with GCC 4.6
+    
+    * sigc++/signal_base.h: Include <cstddef> for size_t.
+
+diff --git a/sigc++/signal_base.h b/sigc++/signal_base.h
+index 1638642..e43bd5e 100644
+--- a/sigc++/signal_base.h
++++ b/sigc++/signal_base.h
+@@ -21,6 +21,7 @@
+ #ifndef _SIGC_SIGNAL_BASE_H_
+ #define _SIGC_SIGNAL_BASE_H_
+ 
++#include <cstddef>
+ #include <list>
+ #include <sigc++config.h>
+ #include <sigc++/type_traits.h>

libsigc++2.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Mar 16 08:57:51 UTC 2011 - ismail@namtrac.org
+
+- Add libsigc++2-gcc46.patch: Patch from upstream 
+  to fix compilation with gcc 4.6
+
+-------------------------------------------------------------------
+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
 

libsigc++2.spec

@@ -22,13 +22,16 @@ Name:           libsigc++2
 %define _name libsigc++
 BuildRequires:  gcc-c++ pkg-config
 Version:        2.2.8
-Release:        1
-Group:          Development/Libraries/C and C++
+Release:        2
+# NOTE: on upgrade to a new upstream version, change the Obsoletes from <= to < (here and in baselibs.conf)
+Group:          System/Libraries
 License:        LGPLv2.1+
 Summary:        Typesafe Signal Framework for C++
 Url:            http://libsigc.sourceforge.net/
 Source:         %{_name}-%{version}.tar.bz2
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM libsigc++2-gcc46.patch idoenmez@suse.de -- Fix compilation with gcc 4.6
+Patch0:         libsigc++2-gcc46.patch
 AutoReqProv:    on
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -40,11 +43,27 @@ 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:       %{name} = %{version} libstdc++-devel
+Requires:       libsigc-2_0-0 = %{version} libstdc++-devel
 
 %description devel
 This library implements a full callback system for use in widget
@@ -56,6 +75,7 @@ of use unmatched by other C++ callback libraries.
 
 %prep
 %setup -q -n %{_name}-%{version}
+%patch0 -p1
 
 %build
 # FIXME: Cannot autoreconf, bad templates:
@@ -75,18 +95,18 @@ rm -f %{buildroot}%{_libdir}/*.la
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%post -n libsigc-2_0-0 -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n libsigc-2_0-0 -p /sbin/ldconfig
 
-%files
+%files -n libsigc-2_0-0
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
-%{_libdir}/*.so.*
+%{_libdir}/libsigc-2.0.so.*
 
 %files devel
 %defattr (-, root, root)
-%{_libdir}/*.so
+%{_libdir}/libsigc-2.0.so
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/sigc++-2.0
 %{_includedir}/sigc++-2.0/