rpms/xfce4-session/F-10 xfce4-session-4.4.2-no-splash.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 xfce4-session.spec, 1.22, 1.23 xfce4-session-4.4.2-autostarteditor-icon.patch, 1.1, NONE

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-session/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12929

Modified Files:
	.cvsignore sources xfce4-session.spec 
Added Files:
	xfce4-session-4.4.2-no-splash.patch 
Removed Files:
	xfce4-session-4.4.2-autostarteditor-icon.patch 
Log Message:
* Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-1
- Update to 4.4.3
- BuildRequire intltool
- Don't display splash by default
- Update gtk-update-icon-cache scriptlets


xfce4-session-4.4.2-no-splash.patch:

--- NEW FILE xfce4-session-4.4.2-no-splash.patch ---
--- xfce4-session-4.4.2.orig/xfce4-session.rc	2007-11-17 20:31:12.000000000 +0100
+++ xfce4-session-4.4.2/xfce4-session.rc	2008-08-27 03:06:48.000000000 +0200
@@ -48,4 +48,4 @@
 
 # Default splash screen selection.
 [Splash Screen]
-Engine=mice
+Engine=


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-session/F-10/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	12 Aug 2008 05:30:09 -0000	1.10
+++ .cvsignore	1 Feb 2009 21:38:19 -0000	1.11
@@ -1,2 +1 @@
-xfce4-session-4.4.2.tar.bz2
-xfce4-autostart-editor.png
+xfce4-session-4.4.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-session/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	12 Aug 2008 05:30:09 -0000	1.10
+++ sources	1 Feb 2009 21:38:19 -0000	1.11
@@ -1,2 +1 @@
-4c3d1acb8ce37ea4dd55d82aeb38e9e7  xfce4-session-4.4.2.tar.bz2
-ce94b443704322c6a3e0053f11f1dd9e  xfce4-autostart-editor.png
+5c522e0d28c952af413cf0c43257b907  xfce4-session-4.4.3.tar.bz2


Index: xfce4-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-session/F-10/xfce4-session.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xfce4-session.spec	12 Aug 2008 05:30:09 -0000	1.22
+++ xfce4-session.spec	1 Feb 2009 21:38:19 -0000	1.23
@@ -1,13 +1,12 @@
 Summary: Xfce session manager
 Name: xfce4-session
-Version: 4.4.2
-Release: 4%{?dist}
+Version: 4.4.3
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
-Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce4-session-4.4.2.tar.bz2
-Source1: http://svn.xfce.org/index.cgi/xfce/checkout/xfce4-session/trunk/icons/48x48/xfce4-autostart-editor.png
+Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-session-%{version}.tar.bz2
 Patch0: xfce4-session-4.4.2-hide-tips.patch
-Patch1: xfce4-session-4.4.2-autostarteditor-icon.patch
+Patch1: xfce4-session-4.4.2-no-splash.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= %{version}
@@ -23,7 +22,7 @@
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: xorg-x11-server-utils
-BuildRequires: dbus-devel GConf2-devel
+BuildRequires: dbus-devel GConf2-devel gnome-keyring-devel >= 2.22
 Requires: fortune-mod
 
 %description
@@ -50,7 +49,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .disable-tips
-%patch1 -p1 -b .autostarteditor-icon
+%patch1 -p1 -b .nospash
 
 %build
 %configure --enable-gnome --enable-final
@@ -60,7 +59,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-cp -a %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.la
@@ -71,13 +69,17 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 /sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 /sbin/ldconfig
 
 %files -f %{name}.lang
@@ -129,6 +131,12 @@
 %{_libexecdir}/balou-*
 
 %changelog
+* Mon Oct 27 2008 Christoph Wickert <cwickert at fedoraproject.org> - 4.4.3-1
+- Update to 4.4.3
+- BuildRequire intltool
+- Don't display splash by default
+- Update gtk-update-icon-cache scriptlets
+
 * Mon Aug 11 2008 Kevin Fenzi <kevin at tummy.com> - 4.4.2-4
 - Fix icon for autostarted applications (fixes #442804)
 


--- xfce4-session-4.4.2-autostarteditor-icon.patch DELETED ---