diff --git a/.cvsignore b/.cvsignore index cc93781..34ba636 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -eog-2.31.3.tar.bz2 +eog-2.31.4-20100623git.tar.bz2 diff --git a/eog.spec b/eog.spec index 07f0c91..280cd52 100644 --- a/eog.spec +++ b/eog.spec @@ -8,14 +8,15 @@ %define desktop_file_utils_version 0.9 %define gail_version 1.2.0 %define libexif_version 0.6.12 +%define alphatag 20100623git Summary: Eye of GNOME image viewer Name: eog -Version: 2.31.3 -Release: 2%{?dist} +Version: 2.31.4 +Release: 0.1.%{alphatag}%{?dist} URL: http://projects.gnome.org/eog/ #VCS: git:git://git.gnome.org/eog -Source: http://download.gnome.org/sources/eog/2.31/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/eog/2.31/%{name}-%{version}-%{alphatag}.tar.bz2 # The GFDL has an "or later version" clause embedded inside the license. # There is no need to add the + here. License: GPLv2+ and GFDL @@ -45,11 +46,6 @@ Requires(pre): GConf2 Requires(preun): GConf2 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version} -# upstream fixes -Patch0: eog-gsettings1.patch -Patch1: eog-gsettings2.patch -Patch2: eog-gsettings3.patch - %description The Eye of GNOME image viewer (eog) is the official image viewer for the GNOME desktop. It can view single image files in a variety of formats, as @@ -74,9 +70,6 @@ functionality to eog. %prep %setup -q -%patch0 -p1 -b .gsettings1 -%patch1 -p1 -b .gsettings2 -%patch2 -p1 -b .gsettings3 echo "NoDisplay=true" >> data/eog.desktop.in # just in case @@ -164,6 +157,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas %{_datadir}/gtk-doc/html/eog %changelog +* Wed Jun 23 2010 Matthias Clasen 2.31.4-0.1.20100623git +- git snapshot that works with glib 2.25.9 + * Wed Jun 16 2010 Matthias Clasen 2.31.3-2 - Make installed gsettings schema compile diff --git a/sources b/sources index cd25339..49ba6f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8812716dadce6f182c9e12f9c593e8a2 eog-2.31.3.tar.bz2 +a3815cfa96ff0c6d7b028a0568cd8f92 eog-2.31.4-20100623git.tar.bz2