Accepting request 73861 from home:dimstar:branches:GNOME:Factory

update to 3.1.2 - requires colord

OBS-URL: https://build.opensuse.org/request/show/73861
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-color-manager?expand=0&rev=35

fix-i2c-include.patch

@@ -1,12 +0,0 @@
-Index: libcolor-glib/gcm-ddc-device.c
-===================================================================
---- gcm/libcolor-glib.orig/gcm-ddc-device.c
-+++ gcm/libcolor-glib/gcm-ddc-device.c
-@@ -37,7 +37,6 @@
- #include <unistd.h>
- #include <sys/ioctl.h>
- #include <linux/types.h>
--#include <linux/i2c.h>
- #include <linux/i2c-dev.h>
- #include <glib/gstdio.h>
- #include <string.h>

gnome-color-manager-3.0.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9e030b2a5dd61010bce25c2e3cdfca6e7ab3954fecb74dbf88f6a8e2c70b7207
-size 3704414

gnome-color-manager-3.1.2.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7131ac66e071a7e13b3a3b2c1856eeba9a5814dd38f7ad2f843e4504d0ae5ead
+size 3625550

gnome-color-manager-as_needed.patch

@@ -0,0 +1,15 @@
+diff -ur gnome-color-manager-3.1.2.orig/tools/Makefile.am gnome-color-manager-3.1.2/tools/Makefile.am
+--- gnome-color-manager-3.1.2.orig/tools/Makefile.am	2011-05-26 11:44:24.000000000 +0200
++++ gnome-color-manager-3.1.2/tools/Makefile.am	2011-06-16 13:24:46.160221608 +0200
+@@ -28,10 +28,10 @@
+ 	gcm-dump-profile.c
+ 
+ gcm_dump_profile_LDADD =				\
++	$(top_builddir)/src/libgcmshared.a		\
+ 	$(GLIB_LIBS)					\
+ 	$(COLORD_LIBS)					\
+ 	$(LCMS_LIBS)					\
+-	$(top_builddir)/src/libgcmshared.a		\
+ 	-lm
+ 
+ gcm_dump_profile_CFLAGS =				\

gnome-color-manager.changes

@@ -1,3 +1,65 @@
+-------------------------------------------------------------------
+Tue Jun 14 09:37:41 CEST 2011 - dimstar@opensuse.org
+
+- Update to version 3.1.2:
+  + Notes:
+    - The preferences panel has been moved to gnome-control-center.
+    - The device and profile registration module has been moved to
+      gnome-settings-daemon and the gcm-session process is now
+      optional.
+  + New Features:
+    - Save extra metadata in the ICC profile after calibration
+    - Translate the metadata key names in the profile viewer
+  + Removed features
+    - Remove all the rendering intent and default properties
+    - Remove support for non-native drivers in the color picker
+    - Remove the device registration functionality
+    - Remove the GSettings schema
+    - Remove the notification for out of date devices
+    - Remove the preferences panel and create a calibration wizard
+    - Remove the profile store functionality
+    - Remove the sensor plug action and sound
+    - Remove the vendor and model quirk fixups
+    - Remove the 'Working Spaces' tab from gcm-prefs
+    - Remove the X11 xrandr-output output property
+  + Bugfix:
+    - Do not reload when colord appears on the bus
+    - Don't crash when we click on a PPD virtual profile
+    - Don't show profiles without filenames in gcm-viewer
+  + Updated translations.
+- Add gnome-color-manager-as_needed.patch: Fix build with
+  -Wl,--as-needed. As the patch touches Makefile.am, add
+  gnome-common BuildRequires and call gnome-autogen.sh.
+- Drop libcolor-glib1 and -devel subpackage. This has been split
+  out to colord. Obsoleting the packages from gnome-color-manager
+  mainpackage (not provided by anything anymore).
+- Remove the glib schema handling: the schemas moved to colord.
+- Drop no longer needed BuildRequires: cups-devel, i2c-tools,
+  sane-backends(-devel), polkit
+- Drop no longer needed pkgconfig()-style buildRequires: gudev-1.0,
+  gnome-settings-daemon libgnome-control-center, libnotify,
+  libusb-1.0
+
+-------------------------------------------------------------------
+Tue May 17 18:26:02 CEST 2011 - dimstar@opensuse.org
+
+- Update to version 3.1.1:
+  + Notes:
+    - This is the first unstable release for GNOME 3.1.
+    - Lots of code has been moved from gnome-color-manager into
+      colord, and this means that colord is now a dependency of
+      gnome-color-manager.
+  + New Features:
+    - Add a 3D gamut hull to the profile viewer
+    - Add a metadata tab to gcm-viewer to display all the color
+      geek information
+    - Add media whitepoint and color temperature data to gcm-picker
+    - Add named color profile support to gcm-viewer
+    - Add the profile version number to the information viewer tab
+  + Removed features that are now provided by colord
+- Drop fix-i2c-include.patch: no longer required.
+- Add pkgconfig(colord) BuildRequires.
+
 -------------------------------------------------------------------
 Tue Apr  5 09:17:12 UTC 2011 - fcrozat@novell.com
 

gnome-color-manager.spec

@@ -20,81 +20,52 @@
 
 
 Name:           gnome-color-manager
-Version:        3.0.0
+Version:        3.1.2
 Release:        1
 Summary:        Color management tools for GNOME
 License:        GPLv2+
 Group:          System/GUI/GNOME
 Url:            http://projects.gnome.org/gnome-color-manager
 Source:         %{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM fix-i2c-include.patch fcrozat@novell.com -- fix incorrect i2c header include; note that in 3.1/3.2, this won't be needed anymore.
+# PATCH-FIX-UPSTREAM gnome-color-manager-as_needed.patch bgo#652722 dimstar@opensuse.org -- Fix build with -Wl,--as-needed
-Patch0:         fix-i2c-include.patch
+Patch0:         gnome-color-manager-as_needed.patch
-BuildRequires:  cups-devel
 BuildRequires:  docbook-utils
 BuildRequires:  gcc-c++
+BuildRequires:  gnome-common
 BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  intltool
-BuildRequires:  i2c-tools
 BuildRequires:  libtiff-devel
-%if 0%{?suse_version} > 1130
-BuildRequires:  sane-backends-devel
-%else
-BuildRequires:  sane-backends
-%endif
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
-# For directory ownership
+BuildRequires:  pkgconfig(colord)
-BuildRequires:  polkit
 BuildRequires:  pkgconfig(exiv2)
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(gnome-settings-daemon)
 BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(gudev-1.0)
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(libcanberra-gtk3)
 BuildRequires:  pkgconfig(libexif)
-BuildRequires:  pkgconfig(libgnome-control-center)
-BuildRequires:  pkgconfig(libnotify)
-BuildRequires:  pkgconfig(libusb-1.0)
 BuildRequires:  pkgconfig(vte-2.90)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xrandr)
 Requires:       PackageKit
 Requires:       shared-color-profiles
 Recommends:     %{name}-lang
+Obsoletes:      libcolor-glib1 <= %{version}
+Obsoletes:      gnome-color-manaer-devel <= %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%glib2_gsettings_schema_requires
 
 %description
 GNOME Color Manager is a session framework that makes it easy to manage,
 install and generate color profiles in the GNOME desktop.
 
-%package devel
-License:        GPLv2+
-Group:          Development/Libraries/GNOME
-Summary:        Color management tools for GNOME -- Development Files
-Requires:       libcolor-glib1 = %{version}
-
-%description devel
-GNOME Color Manager is a session framework that makes it easy to manage,
-install and generate color profiles in the GNOME desktop.
-
-%package -n libcolor-glib1
-License:        GPLv2+
-Group:          System/Libraries
-Summary:        Color management tools for GNOME -- Library
-
-%description -n libcolor-glib1
-GNOME Color Manager is a session framework that makes it easy to manage,
-install and generate color profiles in the GNOME desktop.
-
 %lang_package
 %prep
 %setup -q
-translation-update-upstream
 %patch0 -p1
+translation-update-upstream
 
 %build
+NOCONFIGURE=1 gnome-autogen.sh
 %configure --disable-static \
     --disable-scrollkeeper
 %{__make} %{?jobs:-j %jobs} V=1
@@ -102,9 +73,10 @@ translation-update-upstream
 %install
 %makeinstall
 find %{buildroot} -type f -name "*.la" -delete -print
-%suse_update_desktop_file gcm-prefs GNOME SystemSetup
+%suse_update_desktop_file gcm-session
-%suse_update_desktop_file gcm-apply
 %suse_update_desktop_file gcm-import
+%suse_update_desktop_file gcm-calibrate
+%suse_update_desktop_file gcm-picker
 %suse_update_desktop_file gcm-viewer
 %find_lang %{name} %{?no_lang_C}
 
@@ -114,16 +86,10 @@ rm -rf %{buildroot}
 %post
 %desktop_database_post
 %icon_theme_cache_post
-%glib2_gsettings_schema_post
 
 %postun
 %desktop_database_postun
 %icon_theme_cache_postun
-%glib2_gsettings_schema_postun
-
-%post -n libcolor-glib1 -p /sbin/ldconfig
-
-%postun -n libcolor-glib1 -p /sbin/ldconfig
 
 %files
 %defattr(-, root, root)
@@ -135,38 +101,16 @@ rm -rf %{buildroot}
 %dir %{_datadir}/omf/
 %dir %{_datadir}/omf/%{name}/
 %doc %{_datadir}/omf/%{name}/%{name}-C.omf
-%dir /lib/udev
-%dir /lib/udev/rules.d
-/lib/udev/rules.d/*.rules
 %{_bindir}/gcm-*
-%{_sbindir}/gcm-install-system-wide
-%{_datadir}/GConf/gsettings/org.gnome.color-manager.gschema.migrate
 %{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/interfaces/org.gnome.ColorManager.xml
 %{_datadir}/dbus-1/services/org.gnome.ColorManager.service
-%{_datadir}/glib-2.0/schemas/org.gnome.color-manager.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.color.gschema.xml
 %{_datadir}/gnome-color-manager/
 %{_datadir}/icons/hicolor/*/apps/gnome-color-manager.*
 %{_datadir}/icons/hicolor/*/mimetypes/application-vnd.iccprofile.*
-%{_datadir}/polkit-1/actions/org.gnome.color.policy
 %{_mandir}/man?/*.*
 %{_sysconfdir}/xdg/autostart/*.desktop
 %{_libexecdir}/gcm-helper-exiv
-%{_libdir}/control-center-1/panels/libcolor.so
-%{_libdir}/gnome-settings-daemon-3.0/libcolor.so
-%{_libdir}/gnome-settings-daemon-3.0/color.gnome-settings-plugin
-/lib/udev/gcm-udev-ddc
-
-%files -n libcolor-glib1
-%defattr(-, root, root)
-%{_libdir}/*.so.*
-
-%files devel
-%defattr(-, root, root)
-%{_libdir}/*.so
-%{_includedir}/libcolor-glib/
-%{_libdir}/pkgconfig/libcolor-glib.pc
 
 %files lang -f %{name}.lang