From 0c7c9b77262ceadff4c00d61a21d52f43908ccc71b444c11871b96eea92c36cf Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 6 Aug 2010 11:34:53 +0000 Subject: [PATCH] Accepting request 44713 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gtkmm2 via accept of submit request 44713 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/44713 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtkmm2?expand=0&rev=51 --- gtkmm2.changes | 5 +++++ gtkmm2.spec | 27 ++++++++++++++++++++------- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/gtkmm2.changes b/gtkmm2.changes index 0506a84..2b9297d 100644 --- a/gtkmm2.changes +++ b/gtkmm2.changes @@ -21,6 +21,11 @@ Fri Aug 6 04:35:56 CEST 2010 - vuntz@opensuse.org reset_im_context(). - Add atkmm-devel BuildRequires and remove update-desktop-files BuildRequires. +- Remove explicit Requires from devel package: they will get + automatically added with pkgconfig()-style Requires. +- Respect the shared library packaging policy and create a + libgtkmm-2_4-1 package. +- Fix self-obsoletion issues, to make rpmlint happy. ------------------------------------------------------------------- Thu Jun 10 08:56:43 UTC 2010 - wittemar@googlemail.com diff --git a/gtkmm2.spec b/gtkmm2.spec index bfe6acb..455fcd6 100644 --- a/gtkmm2.spec +++ b/gtkmm2.spec @@ -29,8 +29,6 @@ License: LGPLv2.1+ Summary: C++ Interface for GTK2 (a GUI Library for X) Url: http://www.gtkmm.org/ Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.10/%{_name}-%{version}.tar.bz2 -Provides: gtkmm24 = %{version} -Obsoletes: gtkmm24 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -39,13 +37,28 @@ GTK+ 2. Highlights include typesafe callbacks, widgets extensible via inheritance, and a comprehensive set of widget classes that can be freely combined to quickly create complex user interfaces. +%package -n libgtkmm-2_4-1 +License: LGPLv2.1+ +Group: System/Libraries +Summary: C++ Interface for GTK2 (a GUI library for X) +Provides: gtkmm2 = %{version} +Obsoletes: gtkmm2 < %{version} +Provides: gtkmm24 = %{version} +Obsoletes: gtkmm24 < %{version} + +%description -n libgtkmm-2_4-1 +Gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps +GTK+ 2. Highlights include typesafe callbacks, widgets extensible via +inheritance and a comprehensive set of widget classes that can be +freely combined to quickly create complex user interfaces. + %package devel License: LGPLv2.1+ Group: Development/Libraries/C and C++ Summary: C++ Interface for GTK2 (a GUI library for X) -Requires: %{name} = %{version} gtk2-devel glibmm2-devel cairomm-devel atk-devel pango-devel pangomm-devel +Requires: libgtkmm-2_4-1 = %{version} Provides: gtkmm24-devel = %{version} -Obsoletes: gtkmm24-devel +Obsoletes: gtkmm24-devel < %{version} %description devel Gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps @@ -85,11 +98,11 @@ rm $RPM_BUILD_ROOT/%{_libdir}/*.*a %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig +%post -n libgtkmm-2_4-1 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libgtkmm-2_4-1 -p /sbin/ldconfig -%files +%files -n libgtkmm-2_4-1 %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README %{_libdir}/*.so.*