Accepting request 220394 from home:fcrozat:branches:GNOME:Factory

- Move color management parts to gnome-control-center-color
  subpackage, allowing colord and gnome-color-manager to be
  uninstalled [bnc#861076].
- Ensure gnome-control-center-color Supplements
  gnome-control-center.

OBS-URL: https://build.opensuse.org/request/show/220394
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=233

gnome-control-center.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jan 30 13:00:38 UTC 2014 - fcrozat@suse.com
+
+- Move color management parts to gnome-control-center-color
+  subpackage, allowing colord and gnome-color-manager to be
+  uninstalled [bnc#861076].
+- Ensure gnome-control-center-color Supplements
+  gnome-control-center.
+
 -------------------------------------------------------------------
 Tue Dec 17 12:07:47 UTC 2013 - mgorse@suse.com
 

gnome-control-center.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-control-center
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -113,12 +113,8 @@ BuildRequires:  pkgconfig(xft)
 BuildRequires:  pkgconfig(xi) >= 1.2
 # needed for glxinfo, used by System info panel
 Requires:       Mesa-demo-x
-# The color panel requires colord to be present for the glib schema
-Requires:       colord
 # needed for printers panel
 Requires:       cups-pk-helper
-# The color panel interacts with binaries from gnome-color-manager
-Requires:       gnome-color-manager
 Requires:       gnome-menus
 Requires:       gnome-settings-daemon
 # needed for universal access panel
@@ -167,6 +163,19 @@ Obsoletes:      control-center2-devel < 2.22.1
 The control center is GNOME's main interface for configuration of
 various aspects of your desktop.
 
+%package color
+Summary:        Configuration panel for color management
+Group:          System/GUI/GNOME
+Requires:       %{name} = %{version}
+# The color panel requires colord to be present for the glib schema
+Requires:       colord
+# The color panel interacts with binaries from gnome-color-manager
+Requires:       gnome-color-manager
+Supplements:    %{name}
+
+%description color
+This package provides the color management configuration panel for
+GNOME control center.
 %lang_package
 %prep
 %setup -q
@@ -242,6 +251,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/*
+%exclude %{_datadir}/applications/gnome-color-panel.desktop
 %{_datadir}/applications/*.desktop
 %{_datadir}/bash-completion/completions/gnome-control-center
 %{_datadir}/dbus-1/services/org.gnome.ControlCenter.service
@@ -272,6 +282,10 @@ rm -rf %{buildroot}
 %defattr (-, root, root)
 %{_datadir}/pixmaps/faces/
 
+%files color
+%defattr(-,root,root)
+%{_datadir}/applications/gnome-color-panel.desktop
+
 %files devel
 %defattr (-, root, root)
 %{_datadir}/pkgconfig/gnome-keybindings.pc