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

Fixes after libmutter0 split

OBS-URL: https://build.opensuse.org/request/show/133301
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=99

mutter.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Fri Sep  7 17:22:33 UTC 2012 - vuntz@opensuse.org
+
+- Split a mutter-data subpackage where we put data files (gsettings
+  schema, keybindings, etc.) that are needed by libmutter0:
+  + Without this, gnome-shell would not run if mutter is not
+    installed (which shouldn't be necessary).
+  + Move the use of %glib2_gsettings_schema_* macros from the main
+    subpackage to mutter-data.
+  + Add a Requires for mutter-data to libmutter0.
+- Split a typelib-1_0-Meta-3_0 metapackage:
+  + The typelib is private, but we have no other choice than a
+    subpackage:
+    - it makes no sense to ship it as part of the mutter subpackage
+      (since gnome-shell would then install it)
+    - we can't ship it as part of libmutter0 because of the fixed
+      dependencies it has.
+  + Of course, this is abusing the package conventions for
+    typelibs.
+  + Add a typelib-1_0-Meta-3_0 Requires to devel subpackage.
+- Move ownership of %{_libdir}/mutter/plugins/ directory to
+  libmutter0, since gnome-shell will need this directory too.
+
 -------------------------------------------------------------------
 Tue Sep  4 08:33:25 UTC 2012 - dimstar@opensuse.org
 
@@ -6,7 +29,6 @@ Tue Sep  4 08:33:25 UTC 2012 - dimstar@opensuse.org
     (bgo#677116)
   + Minor improvements and bugfixes (bgo#682648, bgo#682993)
   + Updated translations.
-  + 
 
 -------------------------------------------------------------------
 Sun Sep  2 19:46:10 UTC 2012 - dimstar@opensuse.org

mutter.spec

@@ -56,7 +56,6 @@ Requires:       zenity
 Recommends:     %{name}-lang
 Provides:       windowmanager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%glib2_gsettings_schema_requires
 
 %description
 Mutter is a window and compositing manager based on Clutter, forked
@@ -65,6 +64,9 @@ from Metacity.
 %package -n libmutter0
 Summary:        Window and compositing manager based on Clutter -- Library
 Group:          System/Libraries
+# we need the gsettings schema; hopefully, they'll stay backwards compatible
+# (since we can't require = version, to not break SLPP)
+Requires:       %{name}-data >= %{version}
 
 %description -n libmutter0
 Mutter is a window and compositing manager based on Clutter, forked
@@ -72,6 +74,28 @@ from Metacity.
 
 This package contains a library for shared features.
 
+%package -n typelib-1_0-Meta-3_0
+Summary:        Window and compositing manager based on Clutter -- Introspection bindings
+Group:          System/Libraries
+
+%description -n typelib-1_0-Meta-3_0
+Mutter is a window and compositing manager based on Clutter, forked
+from Metacity.
+
+This package provides the GObject Introspection bindings for libmutter.
+
+%package data
+Summary:        Window and compositing manager based on Clutter -- Data Files
+Group:          System/GUI/GNOME
+Requires:       %{name} = %{version}
+%glib2_gsettings_schema_requires
+
+%description data
+Mutter is a window and compositing manager based on Clutter, forked
+from Metacity.
+
+This package contains data files needed by mutter and its library.
+
 %package tools
 Summary:        Window and compositing manager based on Clutter -- Tools
 Group:          System/GUI/GNOME
@@ -88,6 +112,7 @@ test themes and a small application to test window managers.
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/GNOME
 Requires:       libmutter0 = %{version}
+Requires:       typelib-1_0-Meta-3_0 = %{version}
 
 %description devel
 This package contains all necessary include files and libraries needed
@@ -122,24 +147,43 @@ rm -rf %{buildroot}
 
 %post
 %desktop_database_post
-%glib2_gsettings_schema_post
 
 %post -n libmutter0 -p /sbin/ldconfig
 
+%post data
+%glib2_gsettings_schema_post
+
 %postun
 %desktop_database_postun
-%glib2_gsettings_schema_postun
 
 %postun -n libmutter0 -p /sbin/ldconfig
 
+%postun data
+%glib2_gsettings_schema_postun
+
 %files
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS rationales.txt README
 %{_bindir}/mutter
 %{_bindir}/mutter-message
-%{_libdir}/mutter/
+%{_libdir}/mutter/plugins/default.so
-%exclude %{_libdir}/mutter/Meta-3.0.gir
 %{_datadir}/applications/mutter.desktop
+%doc %{_mandir}/man1/mutter.1%{?ext_man}
+%doc %{_mandir}/man1/mutter-message.1%{?ext_man}
+
+%files -n libmutter0
+%defattr(-,root,root)
+%{_libdir}/libmutter.so.*
+%dir %{_libdir}/mutter/
+# users of libmutter need this directory
+%dir %{_libdir}/mutter/plugins/
+
+%files -n typelib-1_0-Meta-3_0
+%defattr(-,root,root)
+%{_libdir}/mutter/Meta-3.0.typelib
+
+%files data
+%defattr(-,root,root)
 # Do not depend on libgnome just for a directory
 %dir %{_datadir}/gnome
 %dir %{_datadir}/gnome/wm-properties
@@ -148,15 +192,9 @@ rm -rf %{buildroot}
 %dir %{_datadir}/gnome-control-center
 %dir %{_datadir}/gnome-control-center/keybindings
 %{_datadir}/gnome-control-center/keybindings/50-mutter-windows.xml
-%doc %{_mandir}/man1/mutter.1%{?ext_man}
-%doc %{_mandir}/man1/mutter-message.1%{?ext_man}
 %{_datadir}/GConf/gsettings/mutter-schemas.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.mutter.gschema.xml
 
-%files -n libmutter0
-%defattr(-,root,root)
-%{_libdir}/libmutter.so.*
-
 %files tools
 %defattr (-, root, root)
 %{_bindir}/mutter-theme-viewer
@@ -172,8 +210,9 @@ rm -rf %{buildroot}
 %files devel
 %defattr (-, root, root)
 %{_includedir}/mutter/
-%{_libdir}/*.so
+%{_libdir}/libmutter.so
 %{_libdir}/mutter/Meta-3.0.gir
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/libmutter.pc
+%{_libdir}/pkgconfig/mutter-plugins.pc
 
 %changelog