diff --git a/.cvsignore b/.cvsignore index 20e061b..f7260e9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -eog-2.23.6.tar.bz2 +eog-2.23.90.tar.bz2 diff --git a/eog.spec b/eog.spec index ca2af34..09a5528 100644 --- a/eog.spec +++ b/eog.spec @@ -1,4 +1,4 @@ -%define gtk2_version 2.11.6 +%define gtk2_version 2.13.1 %define glib2_version 2.15.3 %define gnome_vfs2_version 2.10.0 %define libgnomeui_version 2.6.0 @@ -13,8 +13,8 @@ Summary: Eye of GNOME image viewer Name: eog -Version: 2.23.6 -Release: 2%{?dist} +Version: 2.23.90 +Release: 1%{?dist} URL: http://www.gnome.org Source: http://download.gnome.org/sources/eog/2.23/%{name}-%{version}.tar.bz2 # needs to be redone @@ -54,9 +54,6 @@ Requires(preun): GConf2 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version} Requires(postun): scrollkeeper -# http://bugzilla.gnome.org/show_bug.cgi?id=547373 -Patch0: lockup.patch - %description Eye of GNOME (EOG) is an image viewer. @@ -78,7 +75,6 @@ This package allows you to develop plugins to extend EOG. %prep %setup -q -%patch0 -p1 -b .lockup echo "NoDisplay=true" >> data/eog.desktop.in # just in case @@ -86,7 +82,7 @@ echo "NoDisplay=true" >> data/eog.desktop.in.in %build -%configure --disable-scrollkeeper +CFLAGS="-O0 -g" %configure --disable-scrollkeeper make %install @@ -159,6 +155,9 @@ fi %{_datadir}/gtk-doc/html/eog %changelog +* Fri Aug 22 2008 Matthias Clasen - 2.23.90-1 +- Update to 2.23.90 + * Tue Aug 12 2008 Matthias Clasen - 2.23.6-2 - Add a possible fix for a deadlock diff --git a/lockup.patch b/lockup.patch index 744ac41..1eaa82b 100644 --- a/lockup.patch +++ b/lockup.patch @@ -1,6 +1,6 @@ diff -up eog-2.23.6/src/main.c.lockup eog-2.23.6/src/main.c ---- eog-2.23.6/src/main.c.lockup 2008-08-12 00:55:08.000000000 -0400 -+++ eog-2.23.6/src/main.c 2008-08-12 00:55:24.000000000 -0400 +--- eog-2.23.6/src/main.c.lockup 2008-08-04 19:07:05.000000000 -0400 ++++ eog-2.23.6/src/main.c 2008-08-12 01:30:44.000000000 -0400 @@ -215,6 +215,8 @@ main (int argc, char **argv) eog_thumbnail_init (); eog_plugin_engine_init (); diff --git a/sources b/sources index e3b1365..5d792cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -558aabfe5cf856f5f9095cce0a9960ef eog-2.23.6.tar.bz2 +d99b907696d59a7c41e2a9e8c0ec34bd eog-2.23.90.tar.bz2