- merged from DEVEL

Changed files:
    eog-desktop.patch -> 1.2
    eog.spec -> 1.80

diff --git a/eog-desktop.patch b/eog-desktop.patch
index 343ac50b45c26ec90dcc30c7baaa7aca698f62dd..3ce99bf0f0e376b95a6bd0e6bdc75588667671fd 100644 (file)
--- a/eog-desktop.patch
+++ b/eog-desktop.patch
@@ -1,11 +1,11 @@
-diff -urN eog-2.8.1.orig/eog.desktop.in eog-2.8.1/eog.desktop.in
---- eog-2.8.1.orig/eog.desktop.in      2004-11-17 11:56:12.489393728 +0100
-+++ eog-2.8.1/eog.desktop.in   2004-11-17 11:57:02.164841912 +0100
+diff -aurN eog-2.13.90.orig/eog.desktop.in.in eog-2.13.90/eog.desktop.in.in
+--- eog-2.13.90.orig/eog.desktop.in.in 2006-01-26 06:17:59.000000000 +0100
++++ eog-2.13.90/eog.desktop.in.in      2006-01-31 00:04:10.020754000 +0100
 @@ -8,7 +8,7 @@
  StartupNotify=true
  Terminal=false
  Type=Application
--Categories=GNOME;Application;Graphics;RasterGraphics;Viewer;
+-Categories=GNOME;GTK;Application;Graphics;RasterGraphics;Viewer;
 +Categories=GTK;GNOME;Graphics;Viewer;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=EOG

diff --git a/eog.spec b/eog.spec
index 76148479c18e201bf398a45452c625456631bfad..e7c4406ec49c9c12909df11b68d7fbcd3f736735 100644 (file)
--- a/eog.spec
+++ b/eog.spec
@@ -2,15 +2,14 @@ Summary:      The Eye of GNOME image viewer
 Summary(pl):   Oko GNOME - przegl±darka obrazków
 Summary(pt_BR):        Visualizador de imagem Eye of GNOME
 Name:          eog
-Version:       2.12.3
+Version:       2.14.0
 Release:       1
 License:       GPL v2
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/eog/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5: cb93289f47060af04026f78e0ecefd71
+Source0:       http://ftp.gnome.org/pub/gnome/sources/eog/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: 8e73c94511aeacdc79039fac238bb6b2
 Patch0:                %{name}-libtool.patch
 Patch1:                %{name}-desktop.patch
-Patch2:                %{name}-debug.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.10.0
 BuildRequires: autoconf
@@ -31,7 +30,6 @@ BuildRequires:        pkgconfig >= 0.9.0
 BuildRequires: popt-devel
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: scrollkeeper
-BuildRequires: xft-devel >= 2.1.2
 Requires(post,preun):  GConf2
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): scrollkeeper
@@ -51,7 +49,6 @@ Aplicativo para visualizar imagens chamado Eye of GNOME.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}