From 3cd2b4f5b105066f0299141283c2cf15bb58922f1f0343e9bd54910ed22d8aa6 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Wed, 8 Sep 2010 12:29:34 +0000
Subject: [PATCH] Accepting request 47430 from
 home:vuntz:branches:GNOME:Factory

ok

OBS-URL: https://build.opensuse.org/request/show/47430
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog?expand=0&rev=81
---
 eog.changes | 14 ++++++++++++++
 eog.spec    | 22 +++++++++++++++-------
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/eog.changes b/eog.changes
index 25a8fdb..b76af45 100644
--- a/eog.changes
+++ b/eog.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Sep  7 23:33:33 CEST 2010 - vuntz@opensuse.org
+
+- Change old-style BuildRequires to pkgconfig() style
+  BuildRequires:
+  + old-style: gnome-desktop-devel, gnome-icon-theme,
+    libexif-devel, liblcms-devel, librsvg-devel, python-gtk-devel,
+    shared-mime-info
+  + new-style: dbus-glib-1, gconf-2.0, gdk-pixbuf-2.0, glib-2.0,
+    gnome-desktop-2.0, gnome-icon-theme, gtk+-2.0, lcms, libexif,
+    librsvg-2.0, libxml-2.0, pygobject-2.0, pygtk-2.0,
+    shared-mime-info.
+- This will make it easier to switch to GNOME 3 libraries.
+
 -------------------------------------------------------------------
 Tue Aug 31 00:22:35 CEST 2010 - vuntz@opensuse.org
 
diff --git a/eog.spec b/eog.spec
index b63deef..9e8e452 100644
--- a/eog.spec
+++ b/eog.spec
@@ -19,6 +19,7 @@
 
 Name:           eog
 Version:        2.31.91
+# FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in
 Release:        1
 License:        GPLv2+ ; LGPLv2.1+
 Summary:        Eye of GNOME for the GNOME 2.x Desktop
@@ -26,19 +27,26 @@ Url:            http://www.gnome.org/
 Group:          Productivity/Graphics/Viewers
 Source:         %{name}-%{version}.tar.bz2
 BuildRequires:  fdupes
-BuildRequires:  gnome-desktop-devel
 BuildRequires:  gnome-doc-utils-devel
-BuildRequires:  gnome-icon-theme
 BuildRequires:  intltool
 BuildRequires:  libexempi-devel
-BuildRequires:  libexif-devel
 BuildRequires:  libjpeg-devel
-BuildRequires:  liblcms-devel
-BuildRequires:  librsvg-devel
-BuildRequires:  python-gtk-devel
-BuildRequires:  shared-mime-info
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  pkgconfig(gconf-2.0)
+BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(gnome-desktop-2.0)
+BuildRequires:  pkgconfig(gnome-icon-theme)
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(lcms)
+BuildRequires:  pkgconfig(libexif)
+BuildRequires:  pkgconfig(librsvg-2.0)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(pygobject-2.0)
+BuildRequires:  pkgconfig(pygtk-2.0)
+BuildRequires:  pkgconfig(shared-mime-info)
 Requires:       %{name}-lang = %{version}
 Provides:       eog2 = %{version}
 Obsoletes:      eog2 < %{version}