From 317c7d84ad18cb42d2bc55874ca97c66f330364e4e597ebba2a4f54f5110c666 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 23 Jul 2010 08:47:48 +0000 Subject: [PATCH 1/4] Accepting request 43813 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/eog-plugins via accept of submit request 43813 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/43813 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog-plugins?expand=0&rev=7 --- eog-plugins-2.30.1.tar.bz2 | 3 +++ eog-plugins.changes | 6 ++++++ eog-plugins.spec | 6 +++--- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 eog-plugins-2.30.1.tar.bz2 diff --git a/eog-plugins-2.30.1.tar.bz2 b/eog-plugins-2.30.1.tar.bz2 new file mode 100644 index 0000000..ba9aea8 --- /dev/null +++ b/eog-plugins-2.30.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e651053367e1d6aecfb8058a93dcac2223ec822a691ee134e9a879662580caf +size 344700 diff --git a/eog-plugins.changes b/eog-plugins.changes index 05a3b59..2422569 100644 --- a/eog-plugins.changes +++ b/eog-plugins.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 02fee11..8432f25 100644 --- a/eog-plugins.spec +++ b/eog-plugins.spec @@ -1,5 +1,5 @@ # -# spec file for package eog-plugins (Version 2.30.0) +# spec file for package eog-plugins (Version 2.30.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,8 +18,8 @@ Name: eog-plugins -Version: 2.30.0 -Release: 2 +Version: 2.30.1 +Release: 1 #FIXME: add postr BuildRequires when we have a package License: GPLv2+ Summary: A collection of plugins for Eye of GNOME From 6e61f69a0841ae42707d1319768b34c7dc6067a5070e597d42941a8da0754e12 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sat, 7 Aug 2010 11:39:09 +0000 Subject: [PATCH 2/4] 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 --- eog-plugins-2.30.1.tar.bz2 | 3 -- eog-plugins-recent-clutter-gtk.patch | 63 ---------------------------- eog-plugins.changes | 6 +++ eog-plugins.spec | 3 -- 4 files changed, 6 insertions(+), 69 deletions(-) delete mode 100644 eog-plugins-2.30.1.tar.bz2 delete mode 100644 eog-plugins-recent-clutter-gtk.patch diff --git a/eog-plugins-2.30.1.tar.bz2 b/eog-plugins-2.30.1.tar.bz2 deleted file mode 100644 index ba9aea8..0000000 --- a/eog-plugins-2.30.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e651053367e1d6aecfb8058a93dcac2223ec822a691ee134e9a879662580caf -size 344700 diff --git a/eog-plugins-recent-clutter-gtk.patch b/eog-plugins-recent-clutter-gtk.patch deleted file mode 100644 index 3ca99fe..0000000 --- a/eog-plugins-recent-clutter-gtk.patch +++ /dev/null @@ -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 diff --git a/eog-plugins.changes b/eog-plugins.changes index 2422569..43c2d23 100644 --- a/eog-plugins.changes +++ b/eog-plugins.changes @@ -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 diff --git a/eog-plugins.spec b/eog-plugins.spec index 8432f25..50bbdec 100644 --- a/eog-plugins.spec +++ b/eog-plugins.spec @@ -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 \ From ba2f647858456f99b0e17e31c82bffe35447ab73adcd46264526f9deb6494e7f Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 10 Aug 2010 00:37:21 +0000 Subject: [PATCH 3/4] Accepting request 45039 from GNOME:Factory checked in (request 45039) OBS-URL: https://build.opensuse.org/request/show/45039 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog-plugins?expand=0&rev=10 --- eog-plugins-recent-clutter-gtk.patch | 63 ++++++++++++++++++++++++++++ eog-plugins.changes | 12 ------ eog-plugins.spec | 9 ++-- 3 files changed, 69 insertions(+), 15 deletions(-) create mode 100644 eog-plugins-recent-clutter-gtk.patch 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 \ From 9b84b6b2da2054549d0ca153d370cdd860eed795d423c7d67ba3c5882e24cd60 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 10 Aug 2010 00:37:22 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/eog-plugins revision 5.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog-plugins?expand=0&rev=97ba2121d3ec0a670d0653a95f09e205 --- eog-plugins-2.30.0.tar.bz2 | 3 -- eog-plugins-2.30.1.tar.bz2 | 3 ++ eog-plugins-recent-clutter-gtk.patch | 63 ---------------------------- eog-plugins.changes | 12 ++++++ eog-plugins.spec | 9 ++-- 5 files changed, 18 insertions(+), 72 deletions(-) delete mode 100644 eog-plugins-2.30.0.tar.bz2 create mode 100644 eog-plugins-2.30.1.tar.bz2 delete mode 100644 eog-plugins-recent-clutter-gtk.patch diff --git a/eog-plugins-2.30.0.tar.bz2 b/eog-plugins-2.30.0.tar.bz2 deleted file mode 100644 index b1a9539..0000000 --- a/eog-plugins-2.30.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dfc6fdcefc128e6bc84b00acdf0b124cfd5b814aef62ce1320d505805743c1cb -size 337547 diff --git a/eog-plugins-2.30.1.tar.bz2 b/eog-plugins-2.30.1.tar.bz2 new file mode 100644 index 0000000..ba9aea8 --- /dev/null +++ b/eog-plugins-2.30.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e651053367e1d6aecfb8058a93dcac2223ec822a691ee134e9a879662580caf +size 344700 diff --git a/eog-plugins-recent-clutter-gtk.patch b/eog-plugins-recent-clutter-gtk.patch deleted file mode 100644 index 3ca99fe..0000000 --- a/eog-plugins-recent-clutter-gtk.patch +++ /dev/null @@ -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 diff --git a/eog-plugins.changes b/eog-plugins.changes index 05a3b59..43c2d23 100644 --- a/eog-plugins.changes +++ b/eog-plugins.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +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 02fee11..50bbdec 100644 --- a/eog-plugins.spec +++ b/eog-plugins.spec @@ -1,5 +1,5 @@ # -# spec file for package eog-plugins (Version 2.30.0) +# spec file for package eog-plugins (Version 2.30.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,16 +18,14 @@ Name: eog-plugins -Version: 2.30.0 -Release: 2 +Version: 2.30.1 +Release: 1 #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 @@ -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 \