Accepting request 60787 from home:vuntz:branches:GNOME:Factory

Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/60787
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=79

gnome-settings-daemon.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Feb 13 16:15:25 CET 2011 - vuntz@opensuse.org
+
+- Call relevant macros in %post/%postun:
+  + %icon_theme_cache_post/postun because the package ships themed
+    icons.
+- Remove ldconfig in %post/%postun: there is no library here.
+- Pass %{?no_lang_C} to %find_lang so that english documentation
+  can be packaged with the program, and not in the lang subpackage.
+
 -------------------------------------------------------------------
 Tue Nov 16 09:27:00 CET 2010 - dimstar@opensuse.org
 

gnome-settings-daemon.spec

@@ -58,7 +58,7 @@ BuildRequires:  pkgconfig(libxklavier)
 BuildRequires:  pkgconfig(nss)
 BuildRequires:  pkgconfig(polkit-gobject-1)
 BuildRequires:  pkgconfig(xi)
-Recommends:     %{name}-lang = %{version}
+Recommends:     %{name}-lang
 # Split so people can depend on this only if needed
 Requires:       %{name}-polkit-datetime = %{version}
 Obsoletes:      resapplet
@@ -133,16 +133,18 @@ make %{?jobs:-j%jobs}
 %endif
 rm %{buildroot}%{_libdir}/gnome-settings-daemon-2.0/*.*a
 %suse_update_desktop_file gnome-settings-daemon
-%find_lang %{name}
+%find_lang %{name} %{?no_lang_C}
 %find_gconf_schemas
 %fdupes %{buildroot}
 
 %clean
 rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
+%post
+%icon_theme_cache_post
 
-%postun -p /sbin/ldconfig
+%postun
+%icon_theme_cache_postun
 
 %pre -f %{name}.schemas_pre