Accepting request 69025 from GNOME:Factory

Pushing G:F (including GNOME3)

OBS-URL: https://build.opensuse.org/request/show/69025
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/eog-plugins?expand=0&rev=8
This commit is contained in:
Sascha Peilicke 2011-05-05 13:17:33 +00:00 committed by Git OBS Bridge
commit e9eb46052f
5 changed files with 80 additions and 119 deletions

View File

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

View File

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

View File

@ -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])

View File

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

View File

@ -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: 3.0.0
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: intltool
BuildRequires: libchamplain-devel
BuildRequires: libexif-devel
BuildRequires: libgdata-devel
BuildRequires: python-gnome-devel
BuildRequires: python-gobject2-devel
BuildRequires: python-gtk-devel
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: pkgconfig(libexif)
BuildRequires: pkgconfig(libgdata)
BuildRequires: pkgconfig(libpeas-1.0)
BuildRequires: pkgconfig(pygobject-2.0)
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