Accepting request 459868 from GNOME:Next

push

OBS-URL: https://build.opensuse.org/request/show/459868
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/colord?expand=0&rev=145

colord.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Jan 24 13:54:20 UTC 2017 - zaitor@opensuse.org
+
+- Split out color profiles in sub package colord-color-profiles.
+  Add shared-color-profiles Obsoletes and Provides.
+- Replace shared-color-profiles with colord-color-profiles
+  Requires.
+- Pass --enable-libcolordcompat, build compatability lib.
+- Pass --enable-print-profiles, build print profiles.
+- Pass --disable-examples, ensure we do not build examples.
+
 -------------------------------------------------------------------
 Mon Dec  5 16:38:49 UTC 2016 - dimstar@opensuse.org
 
@@ -15,7 +26,6 @@ Mon Dec  5 16:38:49 UTC 2016 - dimstar@opensuse.org
       devices.
     - Fix compile with -Wformat-signedness.
     - Fix possible division by zero if parsing /proc/cpuinfo fails.
-    - Install the libcolordcompat.so in the main -libs package.
 
 -------------------------------------------------------------------
 Fri Aug  5 13:24:06 UTC 2016 - zaitor@opensuse.org

colord.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package colord
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -53,7 +53,7 @@ BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(udev)
 Requires(pre):  pwdutils
 Requires:       argyllcms
-Requires:       shared-color-profiles
+Requires:       colord-color-profiles
 Recommends:     %{name}-lang
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
@@ -83,6 +83,20 @@ colord is a system activated daemon that maps devices to color profiles.
 It is used by gnome-color-manager for system integration and use when
 there are no users logged in.
 
+%package color-profiles
+Summary:        System Daemon for Managing Color Devices -- Color profiles
+# Last version of shared-color profiles packaged
+Group:          System/Libraries
+Obsoletes:      shared-color-profiles <= 0.1.6
+Provides:       shared-color-profiles
+
+%description    color-profiles
+colord is a system activated daemon that maps devices to color profiles.
+It is used by gnome-color-manager for system integration and use when
+there are no users logged in.
+
+This package provides color profiles previously provided by shared-color-profiles
+
 %package -n typelib-1_0-Colord-1_0
 Summary:        System Daemon for Managing Color Devices -- Introspection bindings
 Group:          System/Libraries
@@ -110,6 +124,7 @@ libcolorhug library.
 %package -n libcolord-devel
 Summary:        System Daemon for Managing Color Devices -- Development Files
 Group:          Development/Languages/C and C++
+Requires:       %{name}-color-profiles = %{version}
 Requires:       libcolord2 = %{version}
 Requires:       libcolorhug2 = %{version}
 Requires:       typelib-1_0-ColorHug-1_0 = %{version}
@@ -127,9 +142,12 @@ there are no users logged in.
 %build
 %configure \
     --disable-static \
+    --disable-examples \
     --enable-polkit \
     --with-daemon-user=colord \
     --enable-vala \
+    --enable-libcolordcompat \
+    --enable-print-profiles \
     --with-tmpfilesdir=%{_tmpfilesdir} \
     --enable-systemd-login
 make %{?_smp_mflags}
@@ -199,7 +217,6 @@ exit 0
 %{_libexecdir}/%{name}
 %{_libexecdir}/%{name}-session
 %{_datadir}/%{name}/
-%{_datadir}/color/
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ColorHelper.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ColorManager.*
 %{_datadir}/dbus-1/services/org.freedesktop.ColorHelper.service
@@ -215,10 +232,15 @@ exit 0
 %dir %{_libdir}/colord-plugins
 %{_libdir}/colord-plugins/libcd_plugin_camera.so
 %{_libdir}/colord-plugins/libcd_plugin_scanner.so
+%{_libdir}/libcolordcompat.so
 # These should not be here.. this is ugly (fdo#60733)
 #{_libdir}/lib*private.*
 %{_sbindir}/rc%{name}
 
+%files color-profiles
+%defattr(-, root, root)
+%{_datadir}/color/
+
 %files -n libcolord2
 %defattr(-, root, root)
 %{_libdir}/libcolord.so.*