Accepting request 46556 from GNOME:Factory

Copy from GNOME:Factory/eog-plugins based on submit request 46556 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/46556
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/eog-plugins?expand=0&rev=6

eog-plugins-libchamplain-0.8.patch

@@ -0,0 +1,89 @@
+Index: eog-plugins-2.30.1/configure
+===================================================================
+--- eog-plugins-2.30.1.orig/configure
++++ eog-plugins-2.30.1/configure
+@@ -13926,19 +13926,19 @@ if test -n "$CHAMPLAIN_CFLAGS"; then
+     pkg_cv_CHAMPLAIN_CFLAGS="$CHAMPLAIN_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" champlain-0.4 >= 0.4,
+-		  champlain-gtk-0.4 >= 0.4,
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" champlain-0.8 >= 0.7.1,
++		  champlain-gtk-0.8 >= 0.7.1,
+ 		  clutter-gtk-0.10 >= 0.10,
+ 		  libexif >= 0.6.16 \""; } >&5
+-  ($PKG_CONFIG --exists --print-errors " champlain-0.4 >= 0.4,
+-		  champlain-gtk-0.4 >= 0.4,
++  ($PKG_CONFIG --exists --print-errors " champlain-0.8 >= 0.7.1,
++		  champlain-gtk-0.8 >= 0.7.1,
+ 		  clutter-gtk-0.10 >= 0.10,
+ 		  libexif >= 0.6.16 ") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_CHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags " champlain-0.4 >= 0.4,
+-		  champlain-gtk-0.4 >= 0.4,
++  pkg_cv_CHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags " champlain-0.8 >= 0.7.1,
++		  champlain-gtk-0.8 >= 0.7.1,
+ 		  clutter-gtk-0.10 >= 0.10,
+ 		  libexif >= 0.6.16 " 2>/dev/null`
+ else
+@@ -13951,19 +13951,19 @@ if test -n "$CHAMPLAIN_LIBS"; then
+     pkg_cv_CHAMPLAIN_LIBS="$CHAMPLAIN_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" champlain-0.4 >= 0.4,
+-		  champlain-gtk-0.4 >= 0.4,
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" champlain-0.8 >= 0.7.1,
++		  champlain-gtk-0.8 >= 0.7.1,
+ 		  clutter-gtk-0.10 >= 0.10,
+ 		  libexif >= 0.6.16 \""; } >&5
+-  ($PKG_CONFIG --exists --print-errors " champlain-0.4 >= 0.4,
+-		  champlain-gtk-0.4 >= 0.4,
++  ($PKG_CONFIG --exists --print-errors " champlain-0.8 >= 0.7.1,
++		  champlain-gtk-0.8 >= 0.7.1,
+ 		  clutter-gtk-0.10 >= 0.10,
+ 		  libexif >= 0.6.16 ") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_CHAMPLAIN_LIBS=`$PKG_CONFIG --libs " champlain-0.4 >= 0.4,
+-		  champlain-gtk-0.4 >= 0.4,
++  pkg_cv_CHAMPLAIN_LIBS=`$PKG_CONFIG --libs " champlain-0.8 >= 0.7.1,
++		  champlain-gtk-0.8 >= 0.7.1,
+ 		  clutter-gtk-0.10 >= 0.10,
+ 		  libexif >= 0.6.16 " 2>/dev/null`
+ else
+@@ -13985,13 +13985,13 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " champlain-0.4 >= 0.4,
+-		  champlain-gtk-0.4 >= 0.4,
++	        CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " champlain-0.8 >= 0.7.1,
++		  champlain-gtk-0.8 >= 0.7.1,
+ 		  clutter-gtk-0.10 >= 0.10,
+ 		  libexif >= 0.6.16 " 2>&1`
+         else
+-	        CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --print-errors " champlain-0.4 >= 0.4,
+-		  champlain-gtk-0.4 >= 0.4,
++	        CHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --print-errors " champlain-0.8 >= 0.7.1,
++		  champlain-gtk-0.8 >= 0.7.1,
+ 		  clutter-gtk-0.10 >= 0.10,
+ 		  libexif >= 0.6.16 " 2>&1`
+         fi
+Index: eog-plugins-2.30.1/configure.ac
+===================================================================
+--- eog-plugins-2.30.1.orig/configure.ac
++++ eog-plugins-2.30.1/configure.ac
+@@ -314,8 +314,8 @@ if test "$?" = 1
+ then
+ 	
+ 	PKG_CHECK_MODULES(CHAMPLAIN,
+-		[ champlain-0.4 >= 0.4,
+-		  champlain-gtk-0.4 >= 0.4,
++		[ champlain-0.8 >= 0.7.1,
++		  champlain-gtk-0.8 >= 0.7.1,
+ 		  clutter-gtk-0.10 >= 0.10,
+ 		  libexif >= 0.6.16 ],
+ 		[],[have_libchamplain=no])

eog-plugins.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Aug 29 11:40:50 CEST 2010 - vuntz@opensuse.org
+
+- Add eog-plugins-libchamplain-0.8.patch to fix build with latest
+  libchamplain.
+
 -------------------------------------------------------------------
 Sat Aug  7 11:57:19 CEST 2010 - vuntz@opensuse.org
 

eog-plugins.spec

@@ -19,13 +19,15 @@
 
 Name:           eog-plugins
 Version:        2.30.1
-Release:        1
+Release:        2
 #FIXME: add postr BuildRequires when we have a package
 License:        GPLv2+
 Summary:        A collection of plugins for Eye of GNOME
 Group:          Productivity/Graphics/Viewers
 Url:            http://live.gnome.org/EyeOfGnome/Plugins
 Source:         %{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM eog-plugins-libchamplain-0.8.patch bgo#628079 vuntz@opensuse.org -- Fix build with libchamplain 0.7.1 and later
+Patch0:         eog-plugins-libchamplain-0.8.patch
 BuildRequires:  fdupes
 BuildRequires:  gconf2-devel
 BuildRequires:  clutter-gtk-devel
@@ -52,6 +54,7 @@ This package contains plugins for additional features in Eye of GNOME.
 %prep
 %setup -q
 translation-update-upstream
+%patch0 -p1
 
 %build
 %configure \