- updated for eog-2.6.1

[packages/eog.git] / eog.spec

diff --git a/eog.spec b/eog.spec
index 8bb4b0e017916b7dccd90ffac33fdf3bae1db497..f9c0aadae923c944698849b6135550fcab42300d 100644 (file)
--- a/eog.spec
+++ b/eog.spec
@@ -2,41 +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:       0.6
-Release:       3
+Version:       2.6.1
+Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       ftp://ftp.gnome.org/pub/GNOME/unstable/sources/eog/%{name}-%{version}.tar.gz
-Source1:       %{name}.gif
-Patch0:                %{name}-am_ac.patch
-Patch1:                %{name}-am16.patch
-Patch2:                %{name}-ac253.patch
-Patch3:                %{name}-disable_GConf_test.patch
-Patch4:                %{name}-zh_CN.patch
-Patch5:                %{name}-sane-window-size.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: GConf-devel >= 0.12
+BuildRequires: GConf2-devel >= 2.6.1
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: bonobo-devel
-BuildRequires: bonobo-devel >= 0.35
-BuildRequires: gdk-pixbuf-gnome-devel >= 0.9.0
+BuildRequires: eel-devel >= 2.6.1
 BuildRequires: gettext-devel
-BuildRequires: gnome-libs-devel
-BuildRequires: gnome-print-devel >= 0.25
+BuildRequires: gnome-common >= 2.4.0
+BuildRequires: gnome-vfs2-devel >= 2.6.1
 BuildRequires: intltool
-BuildRequires: libglade-gnome-devel
+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 >= 1:2.6.4
 BuildRequires: libtool
-BuildRequires: oaf-devel >= 0.6.2
-Requires(post):        GConf
+BuildRequires: popt-devel
+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                _mandir         %{_prefix}/man
-%define         _sysconfdir     /etc/X11/GNOME
-
 %description
 Eye of GNOME is a tool for viewing/cataloging images.
 
@@ -52,21 +54,20 @@ Aplicativo para visualizar imagens chamado Eye of GNOME.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-mv -f ./po/zh_CN.GB2312.po ./po/zh_CN.po && rm -f ./po/zh_CN.GB2312.gm
-%patch5 -p1
+
+mv po/{no,nb}.po
 
 %build
-rm -f missing
-%{__gettextize}
 %{__libtoolize}
-xml-i18n-toolize --copy --force
-%{__aclocal} -I %{_aclocaldir}/gnome
-%{__autoconf}
+glib-gettextize --copy --force
+intltoolize --copy --force
+%{__aclocal} -I %{_aclocaldir}/gnome2-macros
+%{__autoheader}
+gnome-doc-common
 %{__automake}
+%{__autoconf}
 %configure \
-       --with-bonobo
+       --disable-schemas-install
 %{__make}
 
 %install
@@ -74,26 +75,30 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       Graphicsdir=%{_applnkdir}/Graphics
+       GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 %find_lang %{name} --with-gnome
 
+%post
+%gconf_schema_install
+/usr/bin/scrollkeeper-update
+
+%postun -p /usr/bin/scrollkeeper-update
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-GCONF_CONFIG_SOURCE=xml::%{_sysconfdir}/gconf/gconf.xml.defaults
-export GCONF_CONFIG_SOURCE
-gconftool --makefile-install-rule %{_sysconfdir}/gconf/schemas/eog.schemas
-
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/*
-%{_sysconfdir}/gconf/schemas/eog.schemas
-%{_applnkdir}/Graphics/*
-%{_datadir}/idl/*.idl
+%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}/gnome/ui/*
-%{_datadir}/oaf/*.oaf
+%{_datadir}/gnome-2.0/ui/*
+%{_datadir}/idl/*
+%{_omf_dest_dir}/%{name}
+%{_desktopdir}/*
 %{_pixmapsdir}/*