Accepting request 81119 from home:vuntz:branches:GNOME:Factory

Move to champlain 0.11

OBS-URL: https://build.opensuse.org/request/show/81119
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog-plugins?expand=0&rev=21

eog-plugins.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Sep  6 11:41:58 UTC 2011 - vuntz@opensuse.org
+
+- Move to libchamplain 0.12:
+  + Change pkgconfig(champlain-gtk-0.10) BuildRequires to
+    pkgconfig(champlain-gtk-0.12).
+  + Add a sed hack in %prep to make configure look for the right
+    pkg-config file.
+
 -------------------------------------------------------------------
 Tue Jul 26 00:13:28 CEST 2011 - vuntz@opensuse.org
 

eog-plugins.spec

@@ -20,6 +20,7 @@
 Name:           eog-plugins
 Version:        3.1.2
 Release:        1
+# FIXME: remove sed hack in %%prep when champlain 0.12 support is upstream (bgo#658349)
 #FIXME: add postr BuildRequires when we have a package
 License:        GPLv2+
 Summary:        A collection of plugins for Eye of GNOME
@@ -29,7 +30,7 @@ Source:         http://download.gnome.org/sources/eog-plugins/3.1/%{name}-%{vers
 BuildRequires:  fdupes
 BuildRequires:  intltool
 BuildRequires:  translation-update-upstream
-BuildRequires:  pkgconfig(champlain-gtk-0.10)
+BuildRequires:  pkgconfig(champlain-gtk-0.12)
 BuildRequires:  pkgconfig(clutter-gtk-1.0)
 BuildRequires:  pkgconfig(eog)
 BuildRequires:  pkgconfig(gtk+-3.0)
@@ -50,6 +51,12 @@ This package contains plugins for additional features in Eye of GNOME.
 %prep
 %setup -q
 translation-update-upstream
+# Support libchamplain 0.12; fail when this hack isn't needed anymore. See bgo#658349
+grep -q champlain-gtk-0.12 configure.ac && false
+sed -i "s:champlain-0.10:champlain-0.12:g" configure.ac
+sed -i "s:champlain-gtk-0.10:champlain-gtk-0.12:g" configure.ac
+sed -i "s:champlain-0.10:champlain-0.12:g" configure
+sed -i "s:champlain-gtk-0.10:champlain-gtk-0.12:g" configure
 
 %build
 %configure \