[mate-file-manager/f18] revert last commit "add autostart file for caja desktop"

[leigh123linux]

commit 1516b4941ce03e30d85dfe0047d0e87161f0ba47
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Oct 18 14:07:08 2012 +0100

    revert last commit "add autostart file for caja desktop"
    
    - add no session delay patch

 caja.desktop           |   12 ------------
 mate-file-manager.spec |   14 ++++++++------
 no_session_delay.patch |   10 ++++++++++
 3 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/mate-file-manager.spec b/mate-file-manager.spec
index 3cefd83..4dd50f3 100644
--- a/mate-file-manager.spec
+++ b/mate-file-manager.spec
@@ -12,11 +12,10 @@
 Name:			mate-file-manager
 Summary:		File manager for MATE
 Version:		1.4.0
-Release:		8%{?dist}
+Release:		9%{?dist}
 License:		GPLv2+ and LGPLv2+
 Group:			User Interface/Desktops
 Source0:		http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
-Source1:    		caja.desktop
 
 URL:			http://mate-desktop.org
 Requires:		gamin
@@ -63,6 +62,8 @@ Patch3:		caja-filetype-symlink-fix.patch
 # https://github.com/mate-desktop/mate-desktop/issues/16
 Patch4:		caja_remove_mate-bg-crossfade.patch
 
+Patch5:		no_session_delay.patch
+
 
 %description
 Caja (mate-file-manager) is the file manager and graphical shell
@@ -104,6 +105,7 @@ NOCONFIGURE=1 ./autogen.sh
 %patch2 -p1 -b .gvfs-desktop-key
 %patch3 -p0 -b .symlink
 %patch4 -p1 -b .caja_remove_mate-bg-crossfade
+%patch5 -p1 -b .no_session_delay
 
 %build
 
@@ -155,9 +157,6 @@ desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/caja-browser.desk
 desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/caja-home.desktop
 desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/mate-network-scheme.desktop
 
-# Add autostart files for caja desktop
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/
-install -pm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/
 
 %find_lang caja
 
@@ -198,7 +197,6 @@ fi
 %{_datadir}/applications/mate-network-scheme.desktop
 %{_bindir}/*
 %{_sysconfdir}/mateconf/schemas/*
-%{_sysconfdir}/xdg/autostart/caja.desktop
 %{_datadir}/icons/hicolor/*/apps/caja.png
 %{_datadir}/icons/hicolor/scalable/apps/caja.svg
 %{_mandir}/man1/caja-connect-server.1.*
@@ -221,6 +219,10 @@ fi
 
 
 %changelog
+* Thu Oct 18 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-9
+- revert last commit "add autostart file for caja desktop"
+- add no session delay patch
+
 * Thu Oct 18 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-8
 - add autostart file for caja desktop
 - add build requires libxml2-devel
diff --git a/no_session_delay.patch b/no_session_delay.patch
new file mode 100644
index 0000000..e89589f
--- /dev/null
+++ b/no_session_delay.patch
@@ -0,0 +1,10 @@
+--- a/data/caja.desktop.in.in
++++ b/data/caja.desktop.in.in
+@@ -11,7 +11,6 @@ X-MATE-Bugzilla-Bugzilla=MATE
+ X-MATE-Bugzilla-Product=caja
+ X-MATE-Bugzilla-Component=general
+ X-MATE-Bugzilla-Version=@VERSION@
+-X-MATE-Autostart-Phase=Desktop
+ X-MATE-Autostart-Notify=true
+ X-MATE-AutoRestart=true
+ X-MATE-Provides=filemanager