[caja] don't use caja-autostart script anymore

[Wolfgang Ulbrich]

commit ff6168a267e0527767c5fe1888513095008a3e22
Author: raveit65 <chat-to-me at raveit.de>
Date:   Sat Mar 22 11:17:50 2014 +0100

    don't use caja-autostart script anymore

 caja.spec |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)
---
diff --git a/caja.spec b/caja.spec
index 2497fe6..a21676c 100644
--- a/caja.spec
+++ b/caja.spec
@@ -26,8 +26,6 @@ URL:         http://mate-desktop.org
 %{?rel_build:Source0:     http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz}
 # Source for snapshot-builds.
 %{!?rel_build:Source0:    http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
-Source1:    caja-autostart.desktop
-Source2:    caja-autostart-without-delay
 
 # upstream patches
 # fix https://github.com/mate-desktop/mate-file-manager/issues/122
@@ -121,10 +119,6 @@ for developing caja extensions.
 %prep
 %setup -q%{!?rel_build:n %{name}-%{commit}}
 
-# use the caja-autostart script for autorestart caja if killed, fix spawning x-caja-windows
-# rhbz #886029
-sed -i -e 's,Exec=caja -n,Exec=/usr/bin/caja-autostart,g' data/caja.desktop.in.in data/caja.desktop.in.in
-
 %patch1 -p1 -b .bookmarks
 %patch2 -p1 -b .1.4-style
 %patch3 -p1 -b .x-caja-windows-fix
@@ -162,8 +156,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/.icon-theme.cache
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/caja/extensions-2.0
 
-desktop-file-install --dir=$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart %{SOURCE1}
-
 desktop-file-install                              \
     --delete-original                             \
     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
@@ -172,11 +164,6 @@ $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 # remove needless gsettings convert file
 rm -f  $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/caja.convert
 
-# script that add a delay to start/restart caja, to fix spawning x-caja-windows
-# fix rhbz #886029
-install -m 755 -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/caja-autostart
-
-
 %find_lang caja
 
 
@@ -227,7 +214,6 @@ fi
 %{_libexecdir}/caja-convert-metadata
 %{_datadir}/mime/packages/caja.xml
 %{_datadir}/dbus-1/services/org.mate.freedesktop.FileManager1.service
-%{_sysconfdir}/xdg/autostart/caja-autostart.desktop
 
 %files extensions
 %{_datadir}/gtk-doc/html/libcaja-extension
@@ -248,6 +234,7 @@ fi
 * Sat Mar 22 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.0-2
 - fix for x-caja-window issue, end of a long story
 - remove consolekit usage
+- don't use caja-autostart script anymore
 
 * Tue Mar 04 2014 Dan Mashal <dan.mashal at fedoraproject.org> - 1.8.0-1
 - Update to 1.8.0