From 964f6ccb5b2a5b535ff4d577e2cca4484d44a851ae44bd8292b94a0571cf9591 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Sun, 13 Feb 2011 20:55:37 +0000
Subject: [PATCH] Accepting request 60804 from home:vuntz:branches:GNOME:Apps

Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/60804
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnumeric?expand=0&rev=34
---
 gnumeric.changes | 14 ++++++++++++++
 gnumeric.spec    | 34 +++++++++++++++++++---------------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/gnumeric.changes b/gnumeric.changes
index 44d2725..f3ecc9c 100644
--- a/gnumeric.changes
+++ b/gnumeric.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sat Feb 12 18:49:15 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.
+- Remove wrong call to update-mime-database in %post/%postun.
+- 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.
+
 -------------------------------------------------------------------
 Fri Nov 26 12:59:59 CET 2010 - dimstar@opensuse.org
 
diff --git a/gnumeric.spec b/gnumeric.spec
index a55d52c..b33cbb0 100644
--- a/gnumeric.spec
+++ b/gnumeric.spec
@@ -40,7 +40,7 @@ BuildRequires:  scrollkeeper
 BuildRequires:  shared-mime-info
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
-Requires:       %{name}-lang = %{version}
+Recommends:     %{name}-lang
 Recommends:     liberation-fonts ghostscript-fonts-std
 # For perl-func plugin
 Recommends:     perl
@@ -133,10 +133,9 @@ rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 # gnumeric.keys contains strange MIME types. Ignore them.
 DESTDIR=$RPM_BUILD_ROOT mime-info-to-mime || true
 %suse_update_desktop_file -r -N Gnumeric %{name} Office Spreadsheet GNOME GTK
-%find_lang %{name}
-%find_lang gnumeric-functions %{name}.lang
+%find_lang %{name} %{?no_lang_C}
+%find_lang gnumeric-functions %{?no_lang_C} %{name}.lang
 %find_gconf_schemas
-cat %{name}.schemas_list >%{name}.lst
 find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} +
 %fdupes $RPM_BUILD_ROOT
 
@@ -147,9 +146,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-if test -x usr/bin/update-mime-database ; then
-  usr/bin/update-mime-database usr/share/mime >/dev/null
-fi
+%if 0%{?suse_version} > 1130
+%desktop_database_post
+%icon_theme_cache_post
+%endif
 
 %posttrans -f %{name}.schemas_posttrans
 
@@ -157,13 +157,21 @@ fi
 
 %postun
 /sbin/ldconfig
-if test -x usr/bin/update-mime-database ; then
-  usr/bin/update-mime-database usr/share/mime >/dev/null
-fi
+%if 0%{?suse_version} > 1130
+%desktop_database_postun
+%icon_theme_cache_postun
+%endif
 
-%files -f %{name}.lst
+%files -f %{name}.schemas_list
 %defattr(-, root, root)
 %doc AUTHORS BEVERAGES BUGS COPYING HACKING MAINTAINERS NEWS README ChangeLog OChangeLog*
+%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}/*.so
 %dir %{_libdir}/gnumeric
@@ -185,10 +193,6 @@ fi
 %{_mandir}/man?/*.*
 
 %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)