From 535d35ea8e01e835aaaefabea202b842ec58ff42bce555b97a58aebc33f507d3 Mon Sep 17 00:00:00 2001
From: Ruediger Oertel <ro@suse.de>
Date: Mon, 14 Feb 2011 00:12:46 +0000
Subject: [PATCH] Accepting request 60916 from GNOME:Apps

Accepted submit request 60916 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/60916
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dia?expand=0&rev=21
---
 dia.changes | 13 +++++++++++++
 dia.spec    | 23 +++++++++++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/dia.changes b/dia.changes
index 4d76fd3..da0543a 100644
--- a/dia.changes
+++ b/dia.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Feb 12 17:10:52 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.
+
 -------------------------------------------------------------------
 Sun Jan 24 21:02:39 CET 2010 - vuntz@opensuse.org
 
diff --git a/dia.spec b/dia.spec
index b05d608..ebea055 100644
--- a/dia.spec
+++ b/dia.spec
@@ -57,7 +57,7 @@ Patch14:        dia-python-acinclude.patch
 Patch17:        dia-remove-datetime.patch
 Url:            http://live.gnome.org/Dia
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       %{name}-lang = %{version}
+Recommends:     %{name}-lang
 
 %description
 Dia is designed to be much like the commercial program 'Visio.' It can
@@ -103,7 +103,7 @@ mv %{buildroot}%{_datadir}/locale/sr@Latn %{buildroot}%{_datadir}/locale/sr@lati
 # find_lang doesn't like this
 rm %{buildroot}%{_datadir}/gnome/help/dia/C
 mv %{buildroot}%{_datadir}/gnome/help/dia/en %{buildroot}%{_datadir}/gnome/help/dia/C
-%find_lang %{name}
+%find_lang %{name} %{?no_lang_C}
 # No need for mime-info-to-mime, application/x-dia-diagram is defined in freedesktop.org.xml
 rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info
 rm samples/Makefile* samples/*png
@@ -112,9 +112,28 @@ rm samples/Makefile* samples/*png
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if 0%{?suse_version} > 1130
+%post
+%desktop_database_post
+%icon_theme_cache_post
+%endif
+
+%if 0%{?suse_version} > 1130
+%postun
+%desktop_database_postun
+%icon_theme_cache_postun
+%endif
+
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog INSTALL KNOWN_BUGS NEWS README TODO samples/ font-test*dia
+%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}/dia
 %{_datadir}/applications/*.desktop