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

Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/60737
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=93
---
 file-roller.changes | 15 +++++++++++++++
 file-roller.spec    | 25 +++++++++++++------------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/file-roller.changes b/file-roller.changes
index 3ff3673..65246a4 100644
--- a/file-roller.changes
+++ b/file-roller.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sun Feb 13 14:05:12 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.
+- Stop calling update-mime-database in %post/%postun: there is no
+  mime type definition.
+- 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.
+
 -------------------------------------------------------------------
 Tue Nov 16 09:23:33 CET 2010 - dimstar@opensuse.org
 
diff --git a/file-roller.spec b/file-roller.spec
index 49bae44..e92be43 100644
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -34,7 +34,7 @@ BuildRequires:  nautilus-devel
 BuildRequires:  pkgconfig(gconf-2.0)
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
-Requires:       %{name}-lang = %{version}
+Recommends:     %{name}-lang
 # Formats that we really want to support by default
 Requires:       bzip2
 Requires:       cpio
@@ -102,7 +102,7 @@ translation-update-upstream
 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
 %endif
 %suse_update_desktop_file -N "File Roller" -G "Archive Manager" %name Archiving
-%find_lang %{name}
+%find_lang %{name} %{?no_lang_C}
 %find_gconf_schemas
 rm %{buildroot}%{_libdir}/*/*/*.*a
 %fdupes %{buildroot}
@@ -113,22 +113,27 @@ rm -rf %{buildroot}
 %pre -f %{name}.schemas_pre
 
 %post
-if test -x usr/bin/update-mime-database ; then
-  usr/bin/update-mime-database usr/share/mime >/dev/null
-fi
+%desktop_database_post
+%icon_theme_cache_post
 
 %posttrans -f %{name}.schemas_posttrans
 
 %preun -f %{name}.schemas_preun
 
 %postun
-if test -x usr/bin/update-mime-database ; then
-  usr/bin/update-mime-database usr/share/mime >/dev/null
-fi
+%desktop_database_postun
+%icon_theme_cache_postun
 
 %files -f %{name}.schemas_list
 %defattr(-, root, root)
 %doc AUTHORS NEWS README COPYING
+%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}/file-roller
 %{_libexecdir}/file-roller/
 %{_datadir}/applications/*.desktop
@@ -141,9 +146,5 @@ fi
 %{_libdir}/nautilus/extensions-2.0/*.so
 
 %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
 
 %changelog