- updated for eog-2.6.1

[packages/eog.git] / eog.spec

diff --git a/eog.spec b/eog.spec
index 60fcc92e43a47d58b2bcf138c239839c9fe42b94..f9c0aadae923c944698849b6135550fcab42300d 100644 (file)
--- a/eog.spec
+++ b/eog.spec
@@ -2,38 +2,43 @@ 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:       1.1.0
-Release:       2
+Version:       2.6.1
+Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/1.1/%{name}-%{version}.tar.bz2
-Source1:       %{name}.gif
-Patch0:                %{name}-am.patch
-Patch1:                %{name}-makefile.patch
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
+# Source0-md5: a7207082b9034e9e24ec7adde744c3a9
+Patch0:                %{name}-libtool.patch
+Patch1:                %{name}-bonobo.patch
+Patch2:                %{name}-locale-names.patch
 URL:           http://www.gnome.org/
+BuildRequires: GConf2-devel >= 2.6.1
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: bonobo-activation-devel >= 1.0.3
-BuildRequires: GConf2-devel >= 1.2.1
+BuildRequires: eel-devel >= 2.6.1
 BuildRequires: gettext-devel
-BuildRequires: gnome-vfs2-devel >= 2.0.3
+BuildRequires: gnome-common >= 2.4.0
+BuildRequires: gnome-vfs2-devel >= 2.6.1
 BuildRequires: intltool
-BuildRequires: libbonoboui >= 2.0.2
-BuildRequires: libgnomeprint-devel >= 1.116.0
-BuildRequires: libgnomeui >= 2.0.4
+Buildrequires: libart_lgpl-devel >= 2.3.16
+BuildRequires: libbonobo-devel >= 2.6.0
+BuildRequires: libbonoboui-devel >= 2.6.0
+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.0.1
+BuildRequires: librsvg-devel >= 1:2.6.4
 BuildRequires: libtool
 BuildRequires: popt-devel
-Requires(post): GConf2
-Requires(post): scrollkeeper
+BuildRequires: xft-devel >= 2.1.2
+Requires(post):        GConf2
+Requires(post):        scrollkeeper
+Requires:      libbonobo >= 2.6.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _prefix                         /usr/X11R6
-%define                _sysconfdir             /etc/X11/GNOME2
-%define                _omf_dest_dir   %(scrollkeeper-config --omfdir)
-
 %description
 Eye of GNOME is a tool for viewing/cataloging images.
 
@@ -48,33 +53,35 @@ Aplicativo para visualizar imagens chamado Eye of GNOME.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+
+mv po/{no,nb}.po
 
 %build
-rm -f missing
-sed -e 's/-ourdir/ourdir/' xmldocs.make >xmldocs.make.tmp
-mv xmldocs.make.tmp xmldocs.make
+%{__libtoolize}
 glib-gettextize --copy --force
-libtoolize --copy --force
 intltoolize --copy --force
-aclocal -I %{_aclocaldir}/gnome2-macros
-%{__autoconf}
+%{__aclocal} -I %{_aclocaldir}/gnome2-macros
+%{__autoheader}
+gnome-doc-common
 %{__automake}
+%{__autoconf}
 %configure \
-       --enable-platform-gnome-2
-%{__make} 
+       --disable-schemas-install
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       omf_dest_dir=%{_omf_dest_dir}/%{name}
+       GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 %find_lang %{name} --with-gnome
 
 %post
+%gconf_schema_install
 /usr/bin/scrollkeeper-update
-GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas > /dev/null
 
 %postun -p /usr/bin/scrollkeeper-update
 
@@ -86,11 +93,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/eog-image-viewer
+%attr(755,root,root) %{_libdir}/eog-collection-view
 %{_sysconfdir}/gconf/schemas/*
 %{_libdir}/bonobo/servers/*
 %{_datadir}/%{name}
-%{_datadir}/applications/*
 %{_datadir}/gnome-2.0/ui/*
 %{_datadir}/idl/*
 %{_omf_dest_dir}/%{name}
+%{_desktopdir}/*
 %{_pixmapsdir}/*