[meego-commits] 5297: Changes to Trunk:Testing/xfce4-session

[Anas Nashif]

Hi,
I have made the following changes to xfce4-session in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Anas Nashif

[This message was auto-generated]

---

Request #5297:

  submit:   home:nashif:branches:Trunk:Testing/xfce4-session(r2)(cleanup) -> Trunk:Testing/xfce4-session


Message:
    * Thu Jul 01 2010 Anas Nashif <anas.nashif at intel.com> - 4.6.1
- Exclude tips desktop file, we do not need that and it does
  not hide

State:   new          2010-07-01T14:26:07 nashif
Comment: None



changes files:
--------------
--- xfce4-session.changes
+++ xfce4-session.changes
@@ -0,0 +1,4 @@
+* Thu Jul 01 2010 Anas Nashif <anas.nashif at intel.com> - 4.6.1
+- Exclude tips desktop file, we do not need that and it does
+  not hide
+

spec files:
-----------
--- xfce4-session.spec
+++ xfce4-session.spec
@@ -1,7 +1,6 @@
 # 
 # Do not Edit! Generated by:
-# spectacle version 0.13
-# On 2010-02-26
+# spectacle version 0.17
 # 
 # >> macros
 # << macros
@@ -21,8 +20,9 @@
 Patch2:     xfce4-session-logout.patch
 Requires:   xorg-x11-server-utils
 Requires(post):  /sbin/ldconfig
-Requires(postun):  /sbin/ldconfig
 Requires(post):  /bin/touch
+Requires(post): gtk2
+Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(libglade-2.0)
 BuildRequires:  pkgconfig(libstartup-notification-1.0)
 BuildRequires:  pkgconfig(xt)
@@ -35,7 +35,6 @@
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  GConf2-devel
 
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
 xfce4-session is the session manager for the Xfce desktop environment.
@@ -60,8 +59,12 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+
+# xfce4-session-4.4.2-hide-tips.patch
 %patch0 -p1
+# xfce4-session-4.5.99.1-splash.patch
 %patch1 -p1
+# xfce4-session-logout.patch
 %patch2 -p1
 # >> setup
 # << setup
@@ -74,7 +77,6 @@
     --enable-final \
     --libexecdir=/usr/libexec/xfce4
 
-# Call make instruction with smp support
 make %{?jobs:-j%jobs}
 
 # >> build post
@@ -92,9 +94,6 @@
 # << install post
 %find_lang xfce4-session
 
-%clean
-rm -rf %{buildroot}
-
 
 
 %post
@@ -103,7 +102,15 @@
 %{_bindir}/gtk-update-icon-cache \
   --quiet %{_datadir}/icons/hicolor 2> /dev/null|| :
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+/bin/touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache \
+  --quiet %{_datadir}/icons/hicolor 2> /dev/null|| :
+
+
+
+
 
 
 
@@ -137,7 +144,7 @@
 %{_libdir}/xfce4/splash/engines/libmice.*
 %{_libexecdir}/xfce4/xfsm-shutdown-helper
 %{_mandir}/man1/*
-%config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop
+%exclude %config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop
 %config %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
 /usr/share/icons/hicolor/48x48/apps/xfsm-hibernate.png
 /usr/share/icons/hicolor/48x48/apps/xfsm-suspend.png

other changes:
--------------