From 97aeae4466603369e598095ea48e312b5865a10a42bcb38e3c4679862ad2ffdd Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Sun, 13 Feb 2011 21:05:21 +0000
Subject: [PATCH] Accepting request 60731 from
 home:vuntz:branches:GNOME:Factory

Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/60731
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog?expand=0&rev=90
---
 eog.changes | 14 ++++++++++++++
 eog.spec    | 40 ++++++++++++++++++++++++----------------
 2 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/eog.changes b/eog.changes
index cb561eb..322485b 100644
--- a/eog.changes
+++ b/eog.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sun Feb 13 12:44:59 CET 2011 - vuntz@opensuse.org
+
+- Call relevant macros in %post/%postun:
+  + %desktop_database_post/postun because the package ships at
+    least one desktop file.
+  + %icon_theme_cache_post/postun because the package ships themed
+    icons.
+- Pass %{?no_lang_C} to %find_lang so that english documentation
+  can be packaged with the program, and not in the lang subpackage.
+- Change Requires of lang subpackage to Recommends, since the
+  english documentation is not there anymore.
+- Remove 2.x references in summaries and descriptions.
+
 -------------------------------------------------------------------
 Tue Nov 16 09:19:34 CET 2010 - dimstar@opensuse.org
 
diff --git a/eog.spec b/eog.spec
index a1d74a0..92f00db 100644
--- a/eog.spec
+++ b/eog.spec
@@ -22,7 +22,7 @@ Version:        2.32.1
 Release:        1
 # FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in
 License:        GPLv2+ ; LGPLv2.1+
-Summary:        Eye of GNOME for the GNOME 2.x Desktop
+Summary:        Image Viewer for GNOME
 Url:            http://www.gnome.org/
 Group:          Productivity/Graphics/Viewers
 Source:         %{name}-%{version}.tar.bz2
@@ -47,7 +47,7 @@ BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(pygobject-2.0)
 BuildRequires:  pkgconfig(pygtk-2.0)
 BuildRequires:  pkgconfig(shared-mime-info)
-Requires:       %{name}-lang = %{version}
+Recommends:     %{name}-lang
 Provides:       eog2 = %{version}
 Obsoletes:      eog2 < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -55,22 +55,20 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %py_requires
 
 %description
-Eye of GNOME is a very fast picture viewer. It can be used as a plug-in
-for Nautilus or as a stand-alone application. This version of EOG is
-compiled for the GNOME 2.x Desktop.
+Eye of GNOME is an image viewer program. It is meant to be a fast and
+functional image viewer.
 
 %package devel
 License:        GPLv2+ ; LGPLv2.1+
-Summary:        Eye of GNOME for the GNOME 2.x Desktop
+Summary:        Image Viewer for GNOME
 Group:          Productivity/Graphics/Viewers
 Requires:       %{name} = %{version}
 Requires:       gconf2-devel
 Requires:       gtk2-devel
 
 %description devel
-Eye of GNOME is a very fast picture viewer. It can be used as a plug-in
-for Nautilus or as a stand-alone application. This version of EOG is
-compiled for the GNOME 2.x Desktop.
+Eye of GNOME is an image viewer program. It is meant to be a fast and
+functional image viewer.
 
 %lang_package
 %prep
@@ -89,9 +87,8 @@ make %{?jobs:-j%jobs}
 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
 %endif
 %suse_update_desktop_file -r -N "Eye of Gnome" -G "Image Viewer" eog GNOME Graphics Viewer
-%find_lang %{name}
+%find_lang %{name} %{?no_lang_C}
 %find_gconf_schemas
-cat %{name}.schemas_list >%{name}.lst
 %fdupes %{buildroot}
 
 %clean
@@ -99,13 +96,28 @@ rm -rf %{buildroot}
 
 %pre -f %{name}.schemas_pre
 
+%post
+%desktop_database_post
+%icon_theme_cache_post
+
 %posttrans -f %{name}.schemas_posttrans
 
 %preun -f %{name}.schemas_preun
 
-%files -f %{name}.lst
+%postun
+%desktop_database_postun
+%icon_theme_cache_postun
+
+%files -f %{name}.schemas_list
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
+%dir %{_datadir}/gnome/
+%dir %{_datadir}/gnome/help/
+%dir %{_datadir}/gnome/help/%{name}/
+%doc %{_datadir}/gnome/help/%{name}/C/
+%dir %{_datadir}/omf/
+%dir %{_datadir}/omf/%{name}/
+%doc %{_datadir}/omf/%{name}/%{name}-C.omf
 %{_bindir}/*
 %{_libdir}/eog
 %{_datadir}/applications/eog.desktop
@@ -114,10 +126,6 @@ rm -rf %{buildroot}
 %{_datadir}/icons/*/*/*/*.svg
 
 %files lang -f %{name}.lang
-# Temporary workaround to not depend on libgnome: own the directories
-%defattr (-, root, root)
-%dir %{_datadir}/gnome
-%dir %{_datadir}/gnome/help
 
 %files devel
 %defattr (-, root, root)