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

Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/60785
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=102
---
 gnome-session.changes | 14 ++++++++++++++
 gnome-session.spec    | 22 ++++++++++++++++++----
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/gnome-session.changes b/gnome-session.changes
index 50189ec..e694317 100644
--- a/gnome-session.changes
+++ b/gnome-session.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sun Feb 13 12:50:45 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.
+- Remove 2.x references in summaries and descriptions.
+
 -------------------------------------------------------------------
 Wed Nov 17 13:52:01 CET 2010 - dimstar@opensuse.org
 
diff --git a/gnome-session.spec b/gnome-session.spec
index 6bfd957..b7718af 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -21,7 +21,7 @@ Name:           gnome-session
 Version:        2.32.1
 Release:        1
 License:        GPLv2+
-Summary:        Session Tools for the GNOME 2.x Desktop
+Summary:        Session Tools for the GNOME Desktop
 Url:            http://www.gnome.org
 Group:          System/GUI/GNOME
 Source:         %{name}-%{version}.tar.bz2
@@ -51,7 +51,6 @@ BuildRequires:  libupower-glib-devel
 BuildRequires:  tcpd-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
-Requires:       %{name}-lang = %{version}
 Requires:       %{name}-core = %{version}
 # Programs that are in the default session (we use Requires since Recommends
 # might make it possible for some people to get an empty gnome-session, and
@@ -60,6 +59,7 @@ Requires:       gnome-panel
 Requires:       gnome-settings-daemon
 Requires:       metacity
 Requires:       nautilus
+Recommends:     %{name}-lang
 Obsoletes:      gnome-core
 # There's no splash anymore, so no branding package.
 Provides:       %{name}-branding = %{version}
@@ -71,7 +71,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 This package provides the basic session tools, like session management
-functionality, for the GNOME 2.x Desktop.
+functionality, for the GNOME Desktop.
 
 %package core
 License:        GPLv2+
@@ -125,19 +125,33 @@ install -m644 %{S:7} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
 %suse_update_desktop_file gnome-wm
 %suse_update_desktop_file session-properties X-SuSE-ControlCenter-Personal
 %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop
-%find_lang %{name}-2.0
+%find_lang %{name}-2.0 %{?no_lang_C}
 %find_gconf_schemas
 %fdupes %{buildroot}
 
 %clean
 rm -rf %{buildroot}
 
+%post
+%desktop_database_post
+%icon_theme_cache_post
+
+%postun
+%desktop_database_postun
+%icon_theme_cache_postun
+
 %pre core -f %{name}.schemas_pre
 
+%post core
+%icon_theme_cache_post
+
 %posttrans core -f %{name}.schemas_posttrans
 
 %preun core -f %{name}.schemas_preun
 
+%postun core
+%icon_theme_cache_postun
+
 %files
 %defattr (-, root, root)
 %{_bindir}/gnome