- merged from DEVEL and updated to 2.8.0

- run /usr/bin/update-desktop-database in %%post and %%postun

Changed files:
    eog.spec -> 1.61

diff --git a/eog.spec b/eog.spec
index 4ef5947b6e5cc7227fdfb2040273ef86475cdced..e1bef1db62b88db102922edc2d1ca8f250479e31 100644 (file)
--- a/eog.spec
+++ b/eog.spec
@@ -2,42 +2,36 @@ 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.6.1
+Version:       2.8.0
 Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
-# Source0-md5: a7207082b9034e9e24ec7adde744c3a9
+Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.8/%{name}-%{version}.tar.bz2
+# Source0-md5: a6bf46dfc587ee6cffa9f86c12086a8a
 Patch0:                %{name}-libtool.patch
-Patch1:                %{name}-bonobo.patch
-Patch2:                %{name}-locale-names.patch
-Patch3:                %{name}-libexif069.patch
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.6.1
+BuildRequires: GConf2-devel >= 2.7.92
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: eel-devel >= 2.6.1
+BuildRequires: eel-devel >= 2.7.92
 BuildRequires: gettext-devel
 BuildRequires: gnome-common >= 2.4.0
-BuildRequires: gnome-vfs2-devel >= 2.6.1
+BuildRequires: gnome-vfs2-devel >= 2.7.92
 BuildRequires: intltool
 Buildrequires: libart_lgpl-devel >= 2.3.16
-BuildRequires: libbonobo-devel >= 2.6.0
-BuildRequires: libbonoboui-devel >= 2.6.0
 Buildrequires: libexif-devel >= 1: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: libglade2-devel >= 1:2.4.0
+BuildRequires: libgnomeprint-devel >= 2.7.90
+BuildRequires: libgnomeui-devel >= 2.7.92
+BuildRequires: libgnomeprintui-devel >= 2.7.90
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
-BuildRequires: librsvg-devel >= 1:2.6.4
+BuildRequires: librsvg-devel >= 1:2.8.1
 BuildRequires: libtool
 BuildRequires: popt-devel
 BuildRequires: xft-devel >= 2.1.2
 Requires(post):        GConf2
-Requires(post):        scrollkeeper
-Requires:      libbonobo >= 2.6.0
+Requires(post,postun): scrollkeeper
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -53,11 +47,6 @@ Aplicativo para visualizar imagens chamado Eye of GNOME.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-mv po/{no,nb}.po
 
 %build
 %{__libtoolize}
@@ -79,13 +68,20 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT \
        GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
 %find_lang %{name} --with-gnome
 
 %post
+umask 022
 %gconf_schema_install
 /usr/bin/scrollkeeper-update
+[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1 ||:
 
-%postun -p /usr/bin/scrollkeeper-update
+%postun
+umask 022
+/usr/bin/scrollkeeper-update
+[ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,13 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %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}/gnome-2.0/ui/*
-%{_datadir}/idl/*
 %{_omf_dest_dir}/%{name}
 %{_desktopdir}/*
 %{_pixmapsdir}/*