From e3bab13773423752e8abcec674ca23948600822c8c5fc43c0f51074efd54f6f7 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Wed, 8 Sep 2010 12:28:47 +0000
Subject: [PATCH] Accepting request 47437 from
 home:vuntz:branches:GNOME:Factory

ok

OBS-URL: https://build.opensuse.org/request/show/47437
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-color-manager?expand=0&rev=20
---
 gnome-color-manager.changes | 16 ++++++++++++++++
 gnome-color-manager.spec    | 27 ++++++++++++++-------------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/gnome-color-manager.changes b/gnome-color-manager.changes
index 112c73b..bf2391b 100644
--- a/gnome-color-manager.changes
+++ b/gnome-color-manager.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Sep  8 00:06:11 CEST 2010 - vuntz@opensuse.org
+
+- Remove libgphoto2-devel BuildRequires: this was there only as a
+  workaround for bnc#592143.
+- Change old-style BuildRequires to pkgconfig() style
+  BuildRequires:
+  + old-style: dbus-1-glib-devel, gconf2-devel,
+    gnome-desktop-devel, gtk2-devel, libcanberra-devel,
+    libgudev-1_0-devel, liblcms-devel, libnotify-devel,
+    libunique-devel, vte-devel
+  + new-style: dbus-glib-1, gconf-2.0, glib-2.0, gnome-desktop-2.0,
+    gtk+-2.0, gudev-1.0, lcms, libcanberra-gtk, libnotify,
+    unique-1.0, vte, x11, xrandr, xxf86vm.
+- This will make it easier to switch to GNOME 3 libraries.
+
 -------------------------------------------------------------------
 Tue Aug 31 19:17:16 CEST 2010 - vuntz@opensuse.org
 
diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec
index 56abf66..aaf4a77 100644
--- a/gnome-color-manager.spec
+++ b/gnome-color-manager.spec
@@ -22,34 +22,35 @@
 Name:           gnome-color-manager
 Version:        2.31.91
 Release:        1
-# FIXME: check if libgphoto2-devel BuildRequires is still needed
 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
 BuildRequires:  cups-devel
-BuildRequires:  dbus-1-glib-devel
 BuildRequires:  docbook-utils
-BuildRequires:  gconf2-devel
 BuildRequires:  gnome-doc-utils-devel
-BuildRequires:  gnome-desktop-devel
-BuildRequires:  gtk2-devel
 BuildRequires:  intltool
-BuildRequires:  libcanberra-devel
-BuildRequires:  libgudev-1_0-devel
-BuildRequires:  liblcms-devel
-BuildRequires:  libnotify-devel
 BuildRequires:  libtiff-devel
-BuildRequires:  libunique-devel
 BuildRequires:  sane-backends
-BuildRequires:  vte-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 # For directory ownership
 BuildRequires:  polkit
-# Only needed because of broken sane-backends dependency, see bnc#592143
-BuildRequires:  libgphoto2-devel
+BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  pkgconfig(gconf-2.0)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gnome-desktop-2.0)
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(gudev-1.0)
+BuildRequires:  pkgconfig(lcms)
+BuildRequires:  pkgconfig(libcanberra-gtk)
+BuildRequires:  pkgconfig(libnotify)
+BuildRequires:  pkgconfig(unique-1.0)
+BuildRequires:  pkgconfig(vte)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(xxf86vm)
 Requires:       %{name}-lang = %{version}
 Requires:       PackageKit
 Requires:       shared-color-profiles