- merged from DEVEL and updated to 2.6.0

Changed files:
    eog.spec -> 1.57

diff --git a/eog.spec b/eog.spec
index 3f43972ad8569fda07474dc9e96ebdacb5a59505..568fdb6ca2479113a8723327db2699d7927dffcf 100644 (file)
--- a/eog.spec
+++ b/eog.spec
@@ -2,37 +2,41 @@ 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.4.1
-Release:       2
+Version:       2.6.0
+Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
-# Source0-md5: a7098a85d0f36591521660cc778ed819
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
+# Source0-md5: 7570aa11e8bfbf707b3cc6c3774e11af
 Patch0:                %{name}-libtool.patch
 Patch1:                %{name}-bonobo.patch
+Patch2:                %{name}-locale-names.patch
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.4.0
+BuildRequires: GConf2-devel >= 2.6.0
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: eel-devel >= 2.4.0
+BuildRequires: eel-devel >= 2.6.0
 BuildRequires: gettext-devel
-BuildRequires: gnome-common >= 2.3.0
-BuildRequires: gnome-vfs2-devel >= 2.4.0
+BuildRequires: gnome-common >= 2.4.0
+BuildRequires: gnome-vfs2-devel >= 2.6.0
 BuildRequires: intltool
-BuildRequires: libbonobo-devel >= 2.4.0
-BuildRequires: libbonoboui-devel >= 2.4.0
-BuildRequires: libgnomeprint-devel >= 2.3.1
-BuildRequires: libgnomeui-devel >= 2.4.0
-BuildRequires: libgnomeprintui-devel >= 2.3.1
+Buildrequires: libart_lgpl-devel >= 2.3.16
+BuildRequires: libbonobo-devel >= 2.6.0
+BuildRequires: libbonoboui-devel >= 2.5.4
+Buildrequires: libexif-devel >= 0.5.12
+Buildrequires: libglade2-devel >= 1:2.3.6
+BuildRequires: libgnomeprint-devel >= 2.6.0
+BuildRequires: libgnomeui-devel >= 2.6.0
+BuildRequires: libgnomeprintui-devel >= 2.6.0
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
-BuildRequires: librsvg-devel >= 2.4.0
+BuildRequires: librsvg-devel >= 2.6.0
 BuildRequires: libtool
 BuildRequires: popt-devel
 BuildRequires: xft-devel >= 2.1.2
 Requires(post):        GConf2
 Requires(post):        scrollkeeper
-Requires:      libbonobo >= 2.4.0
+Requires:      libbonobo >= 2.6.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,12 +53,15 @@ Aplicativo para visualizar imagens chamado Eye of GNOME.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+
+mv po/{no,nb}.po
 
 %build
 %{__libtoolize}
-%{__aclocal} -I %{_aclocaldir}/gnome2-macros
 glib-gettextize --copy --force
 intltoolize --copy --force
+%{__aclocal} -I %{_aclocaldir}/gnome2-macros
 %{__autoheader}
 gnome-doc-common
 %{__automake}
@@ -67,7 +74,8 @@ gnome-doc-common
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 %find_lang %{name} --with-gnome