From a277745750d0839482ac7bf316955ef72bd006c6f9d5b4c918e6287e186567b7 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 22 Apr 2011 12:28:21 +0000 Subject: [PATCH 1/3] Accepting request 67356 from GNOME:Next thanks OBS-URL: https://build.opensuse.org/request/show/67356 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog-plugins?expand=0&rev=13 --- eog-plugins-2.30.1.tar.bz2 | 3 - eog-plugins-2.91.90.tar.bz2 | 3 + eog-plugins-libchamplain-0.8.patch | 89 ------------------------------ eog-plugins.changes | 38 +++++++++++++ eog-plugins.spec | 56 ++++++++++--------- 5 files changed, 70 insertions(+), 119 deletions(-) delete mode 100644 eog-plugins-2.30.1.tar.bz2 create mode 100644 eog-plugins-2.91.90.tar.bz2 delete mode 100644 eog-plugins-libchamplain-0.8.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-2.91.90.tar.bz2 b/eog-plugins-2.91.90.tar.bz2 new file mode 100644 index 0000000..5dd16ae --- /dev/null +++ b/eog-plugins-2.91.90.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efb0a40359e1a86639389705d900015a754ad570f141318c52a924a2a2e2748d +size 364250 diff --git a/eog-plugins-libchamplain-0.8.patch b/eog-plugins-libchamplain-0.8.patch deleted file mode 100644 index d364086..0000000 --- a/eog-plugins-libchamplain-0.8.patch +++ /dev/null @@ -1,89 +0,0 @@ -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 e157605..9220ee8 100644 --- a/eog-plugins.changes +++ b/eog-plugins.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Wed Mar 30 15:53:43 UTC 2011 - fcrozat@novell.com + +- Update to version 2.91.90: + + Python Console + - Port to libpeas-based plugin API + + Slideshow Shuffle + - Port to libpeas-based plugin API +- Changes from version 2.91.7: + + Exif Display + - Convert to libpeas-based plugin API + - Migrate from GConf to GSettings + + Fit to Width: + - Convert to libpeas-based plugin API + + Map + - bgo#642802; Use libchamplain 0.10 for the map plugin + - Convert to libpeas-based plugin API + - Mark all images from the collection on the map + - Make markers clickable to change the current picture + + PicasaWeb Uploader + - bgo#639261: Fails to build against libgdata 0.8.0 + + Postr + - Convert to libpeas-based plugin API + + Send By Mail + - Convert to libpeas-based plugin API + + Other changes: + - Disable python plugins until they work correctly with + eog-3.0. +- Drop eog-plugins-libchamplain-0.8.patch: fixed upstream +- Add scripts / macros for GSettings schemas +- postasa plugin isn't available for now +- Change old-style buildRequires to new pkgconfig()/GNOME3 ones: + gconf2-devel, clutter-gtk-devel, eog-devel, gtk2-devel, + libchamplain-devel, libexif-devel, libgdata-devel, + python-gnome-devel, python-gobject2-devel, python-gtk-devel to + champlain-gtk-0.10, libexif, libpeas-1.0, pygobject-2.0, + libgdata, clutter-gtk-1.0, eog, gtk+-3.0. + ------------------------------------------------------------------- Sun Aug 29 11:40:50 CEST 2010 - vuntz@opensuse.org diff --git a/eog-plugins.spec b/eog-plugins.spec index 31337c8..b1cbca4 100644 --- a/eog-plugins.spec +++ b/eog-plugins.spec @@ -1,7 +1,7 @@ # -# spec file for package eog-plugins (Version 2.30.1) +# spec file for package eog-plugins # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,34 +18,30 @@ Name: eog-plugins -Version: 2.30.1 -Release: 2 +Version: 2.91.90 +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-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 -BuildRequires: eog-devel -BuildRequires: glib2-devel -BuildRequires: gtk2-devel +BuildRequires: pkgconfig(clutter-gtk-1.0) +BuildRequires: pkgconfig(eog) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: intltool -BuildRequires: libchamplain-devel -BuildRequires: libexif-devel -BuildRequires: libgdata-devel -BuildRequires: python-gnome-devel -BuildRequires: python-gobject2-devel -BuildRequires: python-gtk-devel +BuildRequires: pkgconfig(champlain-gtk-0.10) +BuildRequires: pkgconfig(libexif) +BuildRequires: pkgconfig(libpeas-1.0) +BuildRequires: pkgconfig(pygobject-2.0) +BuildRequires: pkgconfig(libgdata) BuildRequires: translation-update-upstream Requires: %{name}-lang = %{version} Requires: eog Enhances: eog BuildRoot: %{_tmppath}/%{name}-%{version}-build +%glib2_gsettings_schema_requires %description This package contains plugins for additional features in Eye of GNOME. @@ -54,13 +50,12 @@ This package contains plugins for additional features in Eye of GNOME. %prep %setup -q translation-update-upstream -%patch0 -p1 %build %configure \ --with-plugins=all \ --enable-python -%__make %{?jobs:-j%jobs} +%__make %{?jobs:-j%jobs} V=1 %install %makeinstall @@ -71,20 +66,27 @@ find %{buildroot} -type f -name "*.la" -delete -print %clean rm -rf %{buildroot} +%post +%glib2_gsettings_schema_post + +%postun +%glib2_gsettings_schema_postun + %files %defattr(-,root,root) %{_libdir}/eog/plugins/*.py* %{_libdir}/eog/plugins/*.so %{_libdir}/eog/plugins/exif-display/ -%{_libdir}/eog/plugins/postasa/ +#%{_libdir}/eog/plugins/postasa/ # Explicit list of plugins -%{_libdir}/eog/plugins/exif-display.eog-plugin -%{_libdir}/eog/plugins/fit-to-width.eog-plugin -%{_libdir}/eog/plugins/map.eog-plugin -%{_libdir}/eog/plugins/postasa.eog-plugin -%{_libdir}/eog/plugins/pythonconsole.eog-plugin -%{_libdir}/eog/plugins/send-by-mail.eog-plugin -%{_libdir}/eog/plugins/slideshowshuffle.eog-plugin +%{_libdir}/eog/plugins/exif-display.plugin +%{_libdir}/eog/plugins/fit-to-width.plugin +%{_libdir}/eog/plugins/map.plugin +#%{_libdir}/eog/plugins/postasa.plugin +%{_libdir}/eog/plugins/pythonconsole.plugin +%{_libdir}/eog/plugins/send-by-mail.plugin +%{_libdir}/eog/plugins/slideshowshuffle.plugin +%{_datadir}/glib-2.0/schemas/org.gnome.eog.plugins.exif-display.gschema.xml %files lang -f %{name}.lang From 07bf4ca6f87364de9d9e73ef6c7b881ca3871e30000b022a966f9e60f9b2d847 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 22 Apr 2011 12:34:51 +0000 Subject: [PATCH 2/3] Accepting request 68177 from home:vuntz:branches:GNOME:Factory ok OBS-URL: https://build.opensuse.org/request/show/68177 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog-plugins?expand=0&rev=14 --- eog-plugins.changes | 20 ++++++++++++-------- eog-plugins.spec | 8 ++++---- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/eog-plugins.changes b/eog-plugins.changes index 9220ee8..76c09da 100644 --- a/eog-plugins.changes +++ b/eog-plugins.changes @@ -27,14 +27,18 @@ Wed Mar 30 15:53:43 UTC 2011 - fcrozat@novell.com - Disable python plugins until they work correctly with eog-3.0. - Drop eog-plugins-libchamplain-0.8.patch: fixed upstream -- Add scripts / macros for GSettings schemas -- postasa plugin isn't available for now -- Change old-style buildRequires to new pkgconfig()/GNOME3 ones: - gconf2-devel, clutter-gtk-devel, eog-devel, gtk2-devel, - libchamplain-devel, libexif-devel, libgdata-devel, - python-gnome-devel, python-gobject2-devel, python-gtk-devel to - champlain-gtk-0.10, libexif, libpeas-1.0, pygobject-2.0, - libgdata, clutter-gtk-1.0, eog, gtk+-3.0. +- Use macros for GSettings schemas. +- postasa plugin isn't available for now, so comment it out in file + list. +- Move to pkgconfig()-style BuildRequires, and to gtk3: + + Old ones: clutter-gtk-devel, eog-devel, gconf2-devel, + glib2-devel, gtk2-devel, libchamplain-devel, libexif-devel, + libgdata-devel, python-gobject2-devel. + + New ones: champlain-gtk-0.10, clutter-gtk-1.0, eog, gtk+-3.0, + libexif, libgdata, pygobject-2.0. +- Remove python-gnome-devel, python-gtk-devel BuildRequires and + replace with pkgconfig(libpeas-1.0) as plugins are moving to + libpeas. ------------------------------------------------------------------- Sun Aug 29 11:40:50 CEST 2010 - vuntz@opensuse.org diff --git a/eog-plugins.spec b/eog-plugins.spec index b1cbca4..1ad9ec6 100644 --- a/eog-plugins.spec +++ b/eog-plugins.spec @@ -27,16 +27,16 @@ Group: Productivity/Graphics/Viewers Url: http://live.gnome.org/EyeOfGnome/Plugins Source: %{name}-%{version}.tar.bz2 BuildRequires: fdupes +BuildRequires: intltool +BuildRequires: translation-update-upstream +BuildRequires: pkgconfig(champlain-gtk-0.10) BuildRequires: pkgconfig(clutter-gtk-1.0) BuildRequires: pkgconfig(eog) BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: intltool -BuildRequires: pkgconfig(champlain-gtk-0.10) BuildRequires: pkgconfig(libexif) +BuildRequires: pkgconfig(libgdata) BuildRequires: pkgconfig(libpeas-1.0) BuildRequires: pkgconfig(pygobject-2.0) -BuildRequires: pkgconfig(libgdata) -BuildRequires: translation-update-upstream Requires: %{name}-lang = %{version} Requires: eog Enhances: eog From 95ca7cf1cf12bf1e9a832cc4a4b67a68b284aa13dcb9d32ca1822151e02268d0 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 28 Apr 2011 12:36:42 +0000 Subject: [PATCH 3/3] Accepting request 68682 from home:fcrozat:branches:GNOME:Factory - Update to version 3.0.0: + Re-release 2.91.90 as 3.0.0 to have an "official" 3.0-release. OBS-URL: https://build.opensuse.org/request/show/68682 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog-plugins?expand=0&rev=15 --- eog-plugins-2.91.90.tar.bz2 | 3 --- eog-plugins-3.0.0.tar.bz2 | 3 +++ eog-plugins.changes | 6 ++++++ eog-plugins.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 eog-plugins-2.91.90.tar.bz2 create mode 100644 eog-plugins-3.0.0.tar.bz2 diff --git a/eog-plugins-2.91.90.tar.bz2 b/eog-plugins-2.91.90.tar.bz2 deleted file mode 100644 index 5dd16ae..0000000 --- a/eog-plugins-2.91.90.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efb0a40359e1a86639389705d900015a754ad570f141318c52a924a2a2e2748d -size 364250 diff --git a/eog-plugins-3.0.0.tar.bz2 b/eog-plugins-3.0.0.tar.bz2 new file mode 100644 index 0000000..7fa7d60 --- /dev/null +++ b/eog-plugins-3.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87cced9baf3c8ba84dcad95d774686694f5cb140a187a7bad3891bc50bc4c7bd +size 368036 diff --git a/eog-plugins.changes b/eog-plugins.changes index 76c09da..86b69ee 100644 --- a/eog-plugins.changes +++ b/eog-plugins.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 28 12:00:38 UTC 2011 - fcrozat@novell.com + +- Update to version 3.0.0: + + Re-release 2.91.90 as 3.0.0 to have an "official" 3.0-release. + ------------------------------------------------------------------- Wed Mar 30 15:53:43 UTC 2011 - fcrozat@novell.com diff --git a/eog-plugins.spec b/eog-plugins.spec index 1ad9ec6..29af55b 100644 --- a/eog-plugins.spec +++ b/eog-plugins.spec @@ -18,7 +18,7 @@ Name: eog-plugins -Version: 2.91.90 +Version: 3.0.0 Release: 1 #FIXME: add postr BuildRequires when we have a package License: GPLv2+