diff --git a/eog-plugins-recent-clutter-gtk.patch b/eog-plugins-recent-clutter-gtk.patch new file mode 100644 index 0000000..3ca99fe --- /dev/null +++ b/eog-plugins-recent-clutter-gtk.patch @@ -0,0 +1,63 @@ +Index: eog-plugins-2.30.0/configure +=================================================================== +--- eog-plugins-2.30.0.orig/configure ++++ eog-plugins-2.30.0/configure +@@ -13777,18 +13777,18 @@ if test -n "$CHAMPLAIN_CFLAGS"; 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, +- clutter-gtk-0.10 >= 0.10, ++ clutter-gtk-0.90 >= 0.10, + libexif >= 0.6.16 \""; } >&5 + ($PKG_CONFIG --exists --print-errors " champlain-0.4 >= 0.4, + champlain-gtk-0.4 >= 0.4, +- clutter-gtk-0.10 >= 0.10, ++ clutter-gtk-0.90 >= 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, +- clutter-gtk-0.10 >= 0.10, ++ clutter-gtk-0.90 >= 0.10, + libexif >= 0.6.16 " 2>/dev/null` + else + pkg_failed=yes +@@ -13802,18 +13802,18 @@ if test -n "$CHAMPLAIN_LIBS"; 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, +- clutter-gtk-0.10 >= 0.10, ++ clutter-gtk-0.90 >= 0.10, + libexif >= 0.6.16 \""; } >&5 + ($PKG_CONFIG --exists --print-errors " champlain-0.4 >= 0.4, + champlain-gtk-0.4 >= 0.4, +- clutter-gtk-0.10 >= 0.10, ++ clutter-gtk-0.90 >= 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, +- clutter-gtk-0.10 >= 0.10, ++ clutter-gtk-0.90 >= 0.10, + libexif >= 0.6.16 " 2>/dev/null` + else + pkg_failed=yes +@@ -13834,12 +13834,12 @@ 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, +- clutter-gtk-0.10 >= 0.10, ++ clutter-gtk-0.90 >= 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, +- clutter-gtk-0.10 >= 0.10, ++ clutter-gtk-0.90 >= 0.10, + libexif >= 0.6.16 " 2>&1` + fi + # Put the nasty error message in config.log where it belongs diff --git a/eog-plugins.changes b/eog-plugins.changes index 43c2d23..05a3b59 100644 --- a/eog-plugins.changes +++ b/eog-plugins.changes @@ -1,15 +1,3 @@ -------------------------------------------------------------------- -Sat Aug 7 11:57:19 CEST 2010 - vuntz@opensuse.org - -- Drop eog-plugins-recent-clutter-gtk.patch: we're going back to a - released version of clutter-gtk, so we don't need this anymore. - -------------------------------------------------------------------- -Fri Jul 23 08:47:00 CEST 2010 - vuntz@opensuse.org - -- Update to version 2.30.1: - + Updated translations. - ------------------------------------------------------------------- Fri Jun 4 16:17:18 CEST 2010 - sbrabec@suse.cz diff --git a/eog-plugins.spec b/eog-plugins.spec index 50bbdec..02fee11 100644 --- a/eog-plugins.spec +++ b/eog-plugins.spec @@ -1,5 +1,5 @@ # -# spec file for package eog-plugins (Version 2.30.1) +# spec file for package eog-plugins (Version 2.30.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,14 +18,16 @@ Name: eog-plugins -Version: 2.30.1 -Release: 1 +Version: 2.30.0 +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-recent-clutter-gtk.patch vuntz@opensuse.org -- Will go upstream when upstream switch to recent clutter-gtk +Patch0: eog-plugins-recent-clutter-gtk.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 \