Accepting request 68031 from home:vuntz:branches:GNOME:Factory

ok

OBS-URL: https://build.opensuse.org/request/show/68031
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libwnck?expand=0&rev=64

libwnck.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Apr 21 11:04:32 CEST 2011 - vuntz@opensuse.org
+
+- Add missing pkgconfig(libstartup-notification-1.0) BuildRequires.
+- Move the small utilities to a tools subpackage, and remove the
+  libwnck binary package.
+- Add libwnck Provides/Obsoletes to libwnck-3-0; this will also
+  help make the lang package installable.
+- Change the libwnck Requires in devel package to libwnck-3-0.
+
 -------------------------------------------------------------------
 Wed Apr  6 11:04:04 UTC 2011 - fcrozat@novell.com
 
@@ -13,10 +23,10 @@ Wed Apr  6 11:04:04 UTC 2011 - fcrozat@novell.com
     - Fix crash when fetching some icons
     - Make most of the code not assume the display is the
       default one
-    - Code cleanups (Vincent)
+    - Code cleanups
   + Misc:
-    - Add high-level documentation, with hints and examples (Vincent)
-    - Build fixes (Vincent)
+    - Add high-level documentation, with hints and examples
+    - Build fixes
 - Changes from version 2.91.6:
   + Major changes:
     - Port to GTK+ 3

libwnck.spec

@@ -31,16 +31,10 @@ Source1:        %{name}_spec-update.sh
 Source99:       baselibs.conf
 BuildRequires:  fdupes
 BuildRequires:  gobject-introspection-devel
-BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  intltool
 BuildRequires:  translation-update-upstream
-Recommends:     %{name}-lang
-Requires:       libwnck-3-0 = %{version}
-# bug437293
-%ifarch ppc64
-Obsoletes:      libwnck-64bit
-%endif
-#
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(libstartup-notification-1.0)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -51,6 +45,8 @@ write task lists, pagers, and similar GNOME programs.
 License:        LGPLv2.1+
 Summary:        Window Navigator Construction Kit (Library Package)
 Group:          Development/Libraries/GNOME
+Provides:       %{name} = %{version}
+Obsoletes:      %{name} < %{version}
 Recommends:     %{name}-lang
 # bug437293
 %ifarch ppc64
@@ -62,11 +58,22 @@ Obsoletes:      libwnck-64bit
 The Window Navigator Construction Kit is a library that can be used to
 write task lists, pagers, and similar GNOME programs.
 
+%package tools
+License:        LGPLv2.1+
+Summary:        Window Navigator Construction Kit -- Tools
+Group:          Development/Libraries/GNOME
+
+%description tools
+The Window Navigator Construction Kit is a library that can be used to
+write task lists, pagers, and similar GNOME programs.
+
+This package provides some utilities based on libwnck.
+
 %package devel
 License:        GPLv2+
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/GNOME
-Requires:       %{name} = %{version}
+Requires:       libwnck-3-0 = %{version}
 # bug437293
 %ifarch ppc64
 Obsoletes:      libwnck-devel-64bit
@@ -105,9 +112,8 @@ rm -rf %{buildroot}
 
 %postun -n libwnck-3-0 -p /sbin/ldconfig
 
-%files
+%files tools
 %defattr(-,root,root)
-%doc AUTHORS COPYING README NEWS ChangeLog
 %{_bindir}/wnck-urgency-monitor
 %{_bindir}/wnckprop
 
@@ -115,18 +121,19 @@ rm -rf %{buildroot}
 
 %files -n libwnck-3-0
 %defattr(-,root,root)
+%doc AUTHORS COPYING README NEWS ChangeLog
 %{_libdir}/*.so.*
 %{_libdir}/girepository-1.0/Wnck-3.0.typelib
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/libwnck-3.0
-%{_libdir}/pkgconfig/*.pc
+%{_includedir}/libwnck-3.0/
+%{_libdir}/pkgconfig/libwnck-3.0.pc
 %{_libdir}/*.so
 %{_datadir}/gir-1.0/Wnck-3.0.gir
 # Own these repositories to not depend on gtk-doc while building:
 %dir %{_datadir}/gtk-doc
 %dir %{_datadir}/gtk-doc/html
-%{_datadir}/gtk-doc/html/*
+%{_datadir}/gtk-doc/html/libwnck-3.0/
 
 %changelog