From 66d57a1f41c7efdc2f767ea276ab2fe2f100cfcfcf1d4768143b4669c010bb0e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 6 Feb 2009 21:24:26 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/eog?expand=0&rev=32 --- eog-2.24.1.tar.bz2 | 3 -- eog-2.25.5.tar.bz2 | 3 ++ eog-nullify-gerror-450055.patch | 13 ------ eog-update-pc.patch | 10 +++++ eog.changes | 48 ++++++++++++++++++++ eog.spec | 77 +++++++++++++++++++++++---------- 6 files changed, 114 insertions(+), 40 deletions(-) delete mode 100644 eog-2.24.1.tar.bz2 create mode 100644 eog-2.25.5.tar.bz2 delete mode 100644 eog-nullify-gerror-450055.patch create mode 100644 eog-update-pc.patch diff --git a/eog-2.24.1.tar.bz2 b/eog-2.24.1.tar.bz2 deleted file mode 100644 index cb80f89..0000000 --- a/eog-2.24.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d78e9ad13bd1a670068caebb5634fd41a0ec39eab277565c0ebfa8769af8e22 -size 2277494 diff --git a/eog-2.25.5.tar.bz2 b/eog-2.25.5.tar.bz2 new file mode 100644 index 0000000..055f4a5 --- /dev/null +++ b/eog-2.25.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df91dbde1da614f95adb6ce485f3bbd1d03ecb022bae29521eb6fda68f9e8f0c +size 2297010 diff --git a/eog-nullify-gerror-450055.patch b/eog-nullify-gerror-450055.patch deleted file mode 100644 index fb3f49e..0000000 --- a/eog-nullify-gerror-450055.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/eog-image.c -=================================================================== ---- src/eog-image.c.orig -+++ src/eog-image.c -@@ -1518,7 +1518,7 @@ static gboolean - eog_image_copy_file (EogImage *image, EogImageSaveInfo *source, EogImageSaveInfo *target, GError **error) - { - gboolean result; -- GError *ioerror; -+ GError *ioerror = NULL; - - g_return_val_if_fail (EOG_IS_IMAGE_SAVE_INFO (source), FALSE); - g_return_val_if_fail (EOG_IS_IMAGE_SAVE_INFO (target), FALSE); diff --git a/eog-update-pc.patch b/eog-update-pc.patch new file mode 100644 index 0000000..4da8b6d --- /dev/null +++ b/eog-update-pc.patch @@ -0,0 +1,10 @@ +--- trunk/data/eog.pc.in 2007/07/04 18:09:52 3859 ++++ trunk/data/eog.pc.in 2009/01/29 12:47:40 4974 +@@ -6,6 +6,6 @@ + + Name: Eye of GNOME + Description: The GNOME Image Viewer +-Requires: gtk+-2.0, libgnomeui-2.0 libglade-2.0, gnome-vfs-2.0, gconf-2.0 ++Requires: gtk+-2.0, gconf-2.0 + Version: @VERSION@ + Cflags: -I${includedir} diff --git a/eog.changes b/eog.changes index 6eded6e..8b38f74 100644 --- a/eog.changes +++ b/eog.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Fri Jan 30 16:27:46 CET 2009 - vuntz@novell.com + +- Drop docbook_4, gnutls-devel, indent, libidl, libwnck-devel and + perl-XML-Parser BuildRequires +- Remove pkg-config Requires on the devel package. +- Move all gtk-doc related files to the devel package. + +------------------------------------------------------------------- +Thu Jan 29 20:04:38 WET 2009 - lmedinas@gmail.com + +- Update to version 2.25.5: + + Code improvements / fixes + + Drop libgnome dependency + + Bugs fixed: bgo #559500, bgo #557662, bgo #566104, bgo #566190 + + Translation updates +- Remove unneeded dependencies: libgnomeui-devel, gnome-vfs2-devel, + libgnomeprintui-devel, eel-devel +- Add libjpeg-devel dependency to fix build +- Drop eog-nullify-gerror-450055.patch already upstream +- Add eog-update-pc.patch to update eog-pc dependencies (bgo #569657) + +------------------------------------------------------------------- +Wed Jan 7 00:14:33 WET 2009 - lmedinas@gmail.com + +- Update to version 2.25.4: + + Code improvements / fixes + + Python bindings improvements + + Fix bgo #566367 + + Translation updates + +------------------------------------------------------------------- +Sat Dec 20 09:20:43 EST 2008 - mboman@suse.de + +- Update to version 2.25.3: + + Build system improvements + + Code improvements / fixes + + Fetch tooltip data asynchronously + + UI enhancements + + Workarounds to make remote images work again + + Fix broken keyboard keys + + String improvements + + Code improvements + + Bugs fixed: bgo#559579, bgo#514352, bgo#555480, bgo#558442, bgo#560070, + bgo#560073, bgo#563570, bgo#564290, bgo#564526, bgo#559579, bgo#560065, + bgo#560068, bgo#560336, bgo#560396, bgo#562119 + + Translation updates + ------------------------------------------------------------------- Fri Dec 12 15:24:32 CET 2008 - rodrigo@novell.com diff --git a/eog.spec b/eog.spec index 9a02e93..13476d7 100644 --- a/eog.spec +++ b/eog.spec @@ -1,7 +1,7 @@ # -# spec file for package eog (Version 2.24.1) +# spec file for package eog (Version 2.25.5) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -19,26 +19,18 @@ Name: eog -BuildRequires: docbook_4 -BuildRequires: eel-devel BuildRequires: fdupes BuildRequires: gnome-desktop-devel BuildRequires: gnome-doc-utils-devel BuildRequires: gnome-icon-theme -BuildRequires: gnutls-devel BuildRequires: intltool BuildRequires: libexempi-devel BuildRequires: liblcms-devel BuildRequires: python-devel -BuildRequires: python-gnome-devel BuildRequires: python-gtk-devel -BuildRequires: indent -BuildRequires: libgnomeprintui-devel BuildRequires: shared-mime-info -BuildRequires: libidl BuildRequires: librsvg-devel -BuildRequires: libwnck-devel -BuildRequires: perl-XML-Parser +BuildRequires: libjpeg-devel BuildRequires: libexif-devel BuildRequires: scrollkeeper BuildRequires: update-desktop-files @@ -47,12 +39,12 @@ Group: Productivity/Graphics/Viewers Provides: eog2 = 2.20.0 Obsoletes: eog2 <= 2.20.0 Requires: gnome-icon-theme -Version: 2.24.1 -Release: 2 +Version: 2.25.5 +Release: 1 Summary: Eye of GNOME for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM eog-nullify-gerror-450055.patch bnc#450055 rodrigo@novell.com -Patch1: eog-nullify-gerror-450055.patch +# PATCH-FIX-UPSTREAM eog-update-pc.patch bgo #569657 update eog-pc deps +Patch0: eog-update-pc.patch Url: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -68,7 +60,7 @@ compiled for the GNOME 2.x Desktop. %package devel License: GPL v2 or later; LGPL v2.1 or later -Requires: %{name} = %{version} gconf2-devel gnome-vfs2-devel gtk2-devel libglade2-devel libgnomeui-devel pkg-config +Requires: %{name} = %{version} gconf2-devel gtk2-devel libglade2-devel Summary: Eye of GNOME for the GNOME 2.x Desktop Group: Productivity/Graphics/Viewers AutoReqProv: on @@ -83,7 +75,7 @@ compiled for the GNOME 2.x Desktop. %lang_package %prep %setup -q -%patch1 +%patch0 -p1 %build %configure\ @@ -117,21 +109,58 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/omf/eog %{_datadir}/icons/*/*/*/*.png %{_datadir}/icons/*/*/*/*.svg -%{_datadir}/gtk-doc/html/eog %files lang -f %{name}.lang +# Temporary workaround to not depend on libgnome: own the directories +%defattr (-, root, root) +%dir %{_datadir}/gnome +%dir %{_datadir}/gnome/help %files devel %defattr (-, root, root) -#%dir %{_includedir}/eog -#%dir %{_includedir}/eog/eog -#%{_includedir}/eog/eog/*.h -%dir %{_includedir}/eog-2.20 -%dir %{_includedir}/eog-2.20/eog -%{_includedir}/eog-2.20/eog/*.h +%{_includedir}/eog-2.20 %{_libdir}/pkgconfig/eog.pc +%dir %{_datadir}/gtk-doc +%dir %{_datadir}/gtk-doc/html/ +%{_datadir}/gtk-doc/html/eog %changelog +* Fri Jan 30 2009 vuntz@novell.com +- Drop docbook_4, gnutls-devel, indent, libidl, libwnck-devel and + perl-XML-Parser BuildRequires +- Remove pkg-config Requires on the devel package. +- Move all gtk-doc related files to the devel package. +* Thu Jan 29 2009 lmedinas@gmail.com +- Update to version 2.25.5: + + Code improvements / fixes + + Drop libgnome dependency + + Bugs fixed: bgo #559500, bgo #557662, bgo #566104, bgo #566190 + + Translation updates +- Remove unneeded dependencies: libgnomeui-devel, gnome-vfs2-devel, + libgnomeprintui-devel, eel-devel +- Add libjpeg-devel dependency to fix build +- Drop eog-nullify-gerror-450055.patch already upstream +- Add eog-update-pc.patch to update eog-pc dependencies (bgo #569657) +* Wed Jan 07 2009 lmedinas@gmail.com +- Update to version 2.25.4: + + Code improvements / fixes + + Python bindings improvements + + Fix bgo #566367 + + Translation updates +* Sat Dec 20 2008 mboman@suse.de +- Update to version 2.25.3: + + Build system improvements + + Code improvements / fixes + + Fetch tooltip data asynchronously + + UI enhancements + + Workarounds to make remote images work again + + Fix broken keyboard keys + + String improvements + + Code improvements + + Bugs fixed: bgo#559579, bgo#514352, bgo#555480, bgo#558442, bgo#560070, + bgo#560073, bgo#563570, bgo#564290, bgo#564526, bgo#559579, bgo#560065, + bgo#560068, bgo#560336, bgo#560396, bgo#562119 + + Translation updates * Fri Dec 12 2008 rodrigo@novell.com - Nullify GError before sending it to g_file_copy (bnc#450055) * Wed Oct 22 2008 mboman@suse.de