From 0c45bb5ddafd59dfea206990c64bb15502de90a4d9bf5f32de554f3dc400c2ee Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 17 Jun 2011 06:59:18 +0000 Subject: [PATCH] Accepting request 73905 from home:vuntz:branches:GNOME:Factory Add colord Requires + tweaks OBS-URL: https://build.opensuse.org/request/show/73905 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-color-manager?expand=0&rev=36 --- gnome-color-manager.changes | 21 +++++++++++++-------- gnome-color-manager.spec | 14 +++++++++----- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/gnome-color-manager.changes b/gnome-color-manager.changes index 11f4a61..3a6241b 100644 --- a/gnome-color-manager.changes +++ b/gnome-color-manager.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 17 00:08:29 CEST 2011 - vuntz@opensuse.org + +- Add colord Requires as the daemon is needed at runtime. + ------------------------------------------------------------------- Tue Jun 14 09:37:41 CEST 2011 - dimstar@opensuse.org @@ -30,15 +35,15 @@ Tue Jun 14 09:37:41 CEST 2011 - dimstar@opensuse.org - 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 libcolor-glib1 and -devel subpackages. This has been split + out to colord. Add Obsoletes for the packages from the main + package (without a Provides as they are not provided). +- Remove the glib schema handling: there's no schema anymore. - 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 + sane-backends(-devel), polkit. +- Drop no longer needed pkgconfig()-style buildRequires: + gnome-settings-daemon, gudev-1.0, libgnome-control-center, + libnotify, libusb-1.0. ------------------------------------------------------------------- Tue May 17 18:26:02 CEST 2011 - dimstar@opensuse.org diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec index fabb06c..779e16f 100644 --- a/gnome-color-manager.spec +++ b/gnome-color-manager.spec @@ -22,6 +22,8 @@ Name: gnome-color-manager Version: 3.1.2 Release: 1 +# FIXME: possibly add mash BuildRequires for 3D support. Check first if mash is still alive upstream. +# (https://github.com/clutter-project/mash / packaged as libmash in Fedora) Summary: Color management tools for GNOME License: GPLv2+ Group: System/GUI/GNOME @@ -31,6 +33,7 @@ Source: %{name}-%{version}.tar.bz2 Patch0: gnome-color-manager-as_needed.patch BuildRequires: docbook-utils BuildRequires: gcc-c++ +# Needed for patch0 BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel BuildRequires: intltool @@ -48,10 +51,11 @@ BuildRequires: pkgconfig(vte-2.90) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xrandr) Requires: PackageKit +Requires: colord Requires: shared-color-profiles Recommends: %{name}-lang -Obsoletes: libcolor-glib1 <= %{version} -Obsoletes: gnome-color-manaer-devel <= %{version} +Obsoletes: libcolor-glib1 < %{version} +Obsoletes: gnome-color-manaer-devel < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,8 +65,8 @@ install and generate color profiles in the GNOME desktop. %lang_package %prep %setup -q -%patch0 -p1 translation-update-upstream +%patch0 -p1 %build NOCONFIGURE=1 gnome-autogen.sh @@ -73,10 +77,10 @@ NOCONFIGURE=1 gnome-autogen.sh %install %makeinstall find %{buildroot} -type f -name "*.la" -delete -print -%suse_update_desktop_file gcm-session -%suse_update_desktop_file gcm-import %suse_update_desktop_file gcm-calibrate +%suse_update_desktop_file gcm-import %suse_update_desktop_file gcm-picker +%suse_update_desktop_file gcm-session %suse_update_desktop_file gcm-viewer %find_lang %{name} %{?no_lang_C}