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

Copy from home:vuntz:branches:GNOME:Factory/eog-plugins via accept of submit request 44827 revision 2.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/44827
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog-plugins?expand=0&rev=8
This commit is contained in:
Vincent Untz 2010-08-07 11:39:09 +00:00 committed by Git OBS Bridge
parent 317c7d84ad
commit 6e61f69a08
4 changed files with 6 additions and 69 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0e651053367e1d6aecfb8058a93dcac2223ec822a691ee134e9a879662580caf
size 344700

View File

@ -1,63 +0,0 @@
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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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

View File

@ -26,8 +26,6 @@ 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
@ -54,7 +52,6 @@ This package contains plugins for additional features in Eye of GNOME.
%prep
%setup -q
translation-update-upstream
%patch0 -p1
%build
%configure \