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

Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/60813
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libgnomekbd?expand=0&rev=47
---
 libgnomekbd.changes | 11 +++++++++++
 libgnomekbd.spec    | 18 +++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/libgnomekbd.changes b/libgnomekbd.changes
index 9135572..c81c4b9 100644
--- a/libgnomekbd.changes
+++ b/libgnomekbd.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun Feb 13 16:47:00 CET 2011 - vuntz@opensuse.org
+
+- Call relevant macros in %post/%postun:
+  + %desktop_database_post/postun because the package ships at
+    least one desktop file.
+- 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 Sep 28 00:40:12 CEST 2010 - vuntz@opensuse.org
 
diff --git a/libgnomekbd.spec b/libgnomekbd.spec
index 8095e30..b785b37 100644
--- a/libgnomekbd.spec
+++ b/libgnomekbd.spec
@@ -34,7 +34,7 @@ BuildRequires:  intltool
 BuildRequires:  libxklavier-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
-Recommends:     %{name}-lang = %{version}
+Recommends:     %{name}-lang
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %gconf_schemas_prereq
 
@@ -71,7 +71,7 @@ translation-update-upstream
 %endif
 %{__rm} -f %{buildroot}%{_libdir}/*.la
 %suse_update_desktop_file gkbd-indicator-plugins-capplet
-%find_lang %{name}
+%find_lang %{name} %{?no_lang_C}
 %find_gconf_schemas
 cat %{name}.schemas_list >%{name}.lst
 %fdupes %{buildroot}
@@ -81,22 +81,26 @@ rm -rf %{buildroot}
 
 %pre -f %{name}.schemas_pre
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+%desktop_database_post
 
 %posttrans -f %{name}.schemas_posttrans
 
 %preun -f %{name}.schemas_preun
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+%desktop_database_postun
 
 %files -f %{name}.lst
 %defattr(-, root, root)
 # NEWS README are empty
 %doc AUTHORS COPYING.LIB ChangeLog ChangeLog.libgswitchit ChangeLog.libkbdraw
-%{_bindir}/*
+%{_bindir}/gkbd-indicator-plugins-capplet
 %{_libdir}/*so.*
-%{_datadir}/applications/*.desktop
-%{_datadir}/libgnomekbd
+%{_datadir}/applications/gkbd-indicator-plugins-capplet.desktop
+%{_datadir}/libgnomekbd/
 
 %files lang -f %{name}.lang