From 35085591784346628b56dae2aae9c160ef76c427631806849c709c2fa89d12fd Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sun, 29 Aug 2010 09:51:50 +0000 Subject: [PATCH 1/2] Accepting request 46551 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/eog-plugins via accept of submit request 46551 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/46551 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog-plugins?expand=0&rev=11 --- eog-plugins-libchamplain-0.8.patch | 89 ++++++++++++++++++++++++++++++ eog-plugins.changes | 6 ++ eog-plugins.spec | 3 + 3 files changed, 98 insertions(+) create mode 100644 eog-plugins-libchamplain-0.8.patch diff --git a/eog-plugins-libchamplain-0.8.patch b/eog-plugins-libchamplain-0.8.patch new file mode 100644 index 0000000..d364086 --- /dev/null +++ b/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]) diff --git a/eog-plugins.changes b/eog-plugins.changes index 43c2d23..e157605 100644 --- a/eog-plugins.changes +++ b/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 diff --git a/eog-plugins.spec b/eog-plugins.spec index 50bbdec..45bca38 100644 --- a/eog-plugins.spec +++ b/eog-plugins.spec @@ -26,6 +26,8 @@ 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 \ From 82d2f6e655e9ffaa4953d075bd5ac0b514aa9584b92e7d5687516988b74a831c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 30 Aug 2010 10:32:35 +0000 Subject: [PATCH 2/2] Updating link to change in openSUSE:Factory/eog-plugins revision 6.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog-plugins?expand=0&rev=f420282fd8b7604b665418d94baf5c28 --- eog-plugins.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eog-plugins.spec b/eog-plugins.spec index 45bca38..31337c8 100644 --- a/eog-plugins.spec +++ b/eog-plugins.spec @@ -19,7 +19,7 @@ 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