From 4ba9f1035e15c1be0a95132fb14b7d4382e93bc79026897f6eb5ce02d33988cd Mon Sep 17 00:00:00 2001
From: Guido Berhoerster <gber@opensuse.org>
Date: Mon, 27 Dec 2010 15:49:14 +0000
Subject: [PATCH] - correct url, groups - improve summaries/descriptions -
 remove unsupported locales - do not install documentation in /usr/share/doc -
 moved xfce4-tips-autostart.desktop into the branding supackage in   order to
 allow disabling startup tips as part of the branding - remove all libtool
 files

OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=40
---
 xfce4-session.changes | 11 +++++++++++
 xfce4-session.spec    | 30 +++++++++++++++++++-----------
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/xfce4-session.changes b/xfce4-session.changes
index b41075c..c3da5a0 100644
--- a/xfce4-session.changes
+++ b/xfce4-session.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Dec 27 15:17:25 UTC 2010 - gber@opensuse.org
+
+- correct url, groups
+- improve summaries/descriptions
+- remove unsupported locales
+- do not install documentation in /usr/share/doc
+- moved xfce4-tips-autostart.desktop into the branding supackage in
+  order to allow disabling startup tips as part of the branding
+- remove all libtool files
+
 -------------------------------------------------------------------
 Sun Dec  5 22:06:58 UTC 2010 - prusnak@opensuse.org
 
diff --git a/xfce4-session.spec b/xfce4-session.spec
index 40fc2dd..4c40896 100644
--- a/xfce4-session.spec
+++ b/xfce4-session.spec
@@ -15,14 +15,12 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           xfce4-session
 Version:        4.7.2
 Release:        1
 License:        GPLv2+
 Summary:        Xfce Session manager
-Url:            http://www.xfce.org/
+Url:            http://www.xfce.org/projects/xfce4-session/
 Group:          System/GUI/XFCE
 Source:         %{name}-%{version}.tar.bz2
 Patch0:         xfce4-session-4.7.1-fix-missing-include.patch
@@ -38,6 +36,7 @@ BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11
 Requires:       %{name}-branding >= %{version}
 Requires:       xfce-utils
+Requires:       xfconf
 Recommends:     fortune
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -46,8 +45,8 @@ xfce4-session is the session manager for the Xfce desktop environment.
 
 %package        devel
 License:        GPLv2+
-Summary:        Xfce Session manager
-Group:          System/GUI/XFCE
+Summary:        Development files for xfce4-session
+Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
 Requires:       pkgconfig(dbus-glib-1)
 Requires:       pkgconfig(libwnck-1.0)
@@ -59,9 +58,11 @@ Requires:       pkgconfig(libxfconf-0)
 %description devel
 xfce4-session is the session manager for the Xfce desktop environment.
 
+This package contains development files needed to develop custom splash themes.
+
 %package branding-upstream
 License:        GPLv2+
-Summary:        Xfce Session manager
+Summary:        Xfce Session manager upstream branding
 Group:          System/GUI/XFCE
 Supplements:    packageand(%{name}:branding-upstream)
 Provides:       %{name}-branding = %{version}
@@ -73,20 +74,28 @@ BuildArch:      noarch
 %description branding-upstream
 xfce4-session is the session manager for the Xfce desktop environment.
 
+This package contains the upstream branding.
+
 %prep
 %setup -q
 %patch0 -p1
 
 %build
 %configure \
+    --docdir=%{_defaultdocdir}/%{name} \
     --disable-static \
     --enable-session-screenshots
 make %{?_smp_mflags}
 
 %install
 %make_install
+%suse_update_desktop_file xfce-session-settings
+%suse_update_desktop_file xfce4-session-logout
+install -p -m 644 AUTHORS BUGS COPYING ChangeLog NEWS README TODO \
+    %{buildroot}/%{_defaultdocdir}/%{name}
+rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK}
 %find_lang %{name}
-rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/xfce4/splash/engines/*.la
+rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/xfce4/session/splash-engines/*.la
 
 %clean
 rm -rf %{buildroot}
@@ -99,7 +108,7 @@ rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
+%doc %{_defaultdocdir}/%{name}
 %{_bindir}/xfce4-session
 %{_bindir}/xfce4-session-logout
 %{_bindir}/xfce4-session-settings
@@ -111,8 +120,6 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*
 %{_datadir}/icons/*/*
 %{_datadir}/xfce4/
-%{_datadir}/doc/xfce4-session
-%{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop
 
 %files devel
 %defattr(-,root,root)
@@ -125,6 +132,7 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/xdg/xfce4
 %dir %{_sysconfdir}/xdg/xfce4/xfconf
 %dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml
-%{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+%config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+%config %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop
 
 %changelog