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

Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/60755
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-color-manager?expand=0&rev=30
---
 gnome-color-manager.changes | 13 +++++++++++++
 gnome-color-manager.spec    | 22 +++++++++++++++++-----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/gnome-color-manager.changes b/gnome-color-manager.changes
index 6756690..da82df2 100644
--- a/gnome-color-manager.changes
+++ b/gnome-color-manager.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Feb 13 14:20:08 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.
+
 -------------------------------------------------------------------
 Tue Dec 14 15:09:28 CET 2010 - vuntz@opensuse.org
 
diff --git a/gnome-color-manager.spec b/gnome-color-manager.spec
index 5e6df77..eb8c0c6 100644
--- a/gnome-color-manager.spec
+++ b/gnome-color-manager.spec
@@ -55,9 +55,9 @@ BuildRequires:  pkgconfig(vte)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xxf86vm)
-Requires:       %{name}-lang = %{version}
 Requires:       PackageKit
 Requires:       shared-color-profiles
+Recommends:     %{name}-lang
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %gconf_schemas_prereq
 
@@ -84,7 +84,7 @@ grep -q X-GNOME-SystemSettings %{buildroot}%{_datadir}/applications/gcm-prefs.de
 %suse_update_desktop_file -r gcm-prefs GNOME Settings HardwareSettings
 %suse_update_desktop_file gcm-apply
 %suse_update_desktop_file gcm-import
-%find_lang %{name}
+%find_lang %{name} %{?no_lang_C}
 %find_gconf_schemas
 
 %clean
@@ -92,13 +92,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
 
+%postun
+%desktop_database_postun
+%icon_theme_cache_postun
+
 %files -f %{name}.schemas_list
 %defattr(-, root, root)
 %doc AUTHORS ChangeLog COPYING MAINTAINERS 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
 %dir /lib/udev
 %dir /lib/udev/rules.d
 /lib/udev/rules.d/*.rules
@@ -114,8 +129,5 @@ rm -rf %{buildroot}
 %{_sysconfdir}/xdg/autostart/*.desktop
 
 %files lang -f %{name}.lang
-%defattr(-, root, root)
-%dir %{_datadir}/gnome
-%dir %{_datadir}/gnome/help
 
 %changelog