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

Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/60753
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-bluetooth?expand=0&rev=59
---
 gnome-bluetooth.changes | 13 +++++++++++++
 gnome-bluetooth.spec    | 17 ++++++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes
index 6e2252c..4340217 100644
--- a/gnome-bluetooth.changes
+++ b/gnome-bluetooth.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Feb 13 14:19:21 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.
+
 -------------------------------------------------------------------
 Fri Oct  1 18:08:32 CEST 2010 - vuntz@opensuse.org
 
diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec
index 02d5ca1..5a843b2 100644
--- a/gnome-bluetooth.spec
+++ b/gnome-bluetooth.spec
@@ -42,11 +42,11 @@ BuildRequires:  libunique-devel
 BuildRequires:  nautilus-sendto-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
-Requires:       %{name}-lang = %{version}
 # Require bluez (mandatory, as per readme, bnc#622946)
 Requires:       bluez >= 4.36
 # Require obexd for bluetooth-sendto to work (bnc#622946)
 Requires:       obexd
+Recommends:     %{name}-lang
 Provides:       bluez-gnome = 1.8
 Obsoletes:      bluez-gnome < 1.8
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -131,8 +131,8 @@ NOCONFIGURE=1 gnome-autogen.sh
 find %{buildroot} -type f -name "*.la" -delete -print
 %suse_update_desktop_file bluetooth-properties
 %suse_update_desktop_file bluetooth-applet
-%find_lang %{name}2
-%find_lang %{name} %{name}2.lang
+%find_lang %{name}2 %{?no_lang_C}
+%find_lang %{name} %{?no_lang_C} %{name}2.lang
 %fdupes %{buildroot}
 
 %clean
@@ -140,9 +140,13 @@ rm -rf %{buildroot}
 
 %post
 %glib2_gsettings_schema_post
+%desktop_database_post
+%icon_theme_cache_post
 
 %postun
 %glib2_gsettings_schema_postun
+%desktop_database_postun
+%icon_theme_cache_postun
 
 %post -n nautilus-sendto-plugin-bluetooth
 %glib2_gsettings_schema_post
@@ -157,6 +161,13 @@ rm -rf %{buildroot}
 %files
 %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}/bluetooth-*
 %{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop
 %{_datadir}/applications/bluetooth-properties.desktop