[mate-file-manager/f17] Drop caja_remove_mate-bg-crossfade patch as it was causing crash

[leigh123linux]

commit b9eea9e7dc7a8ae95b064ced23370fc1926d1857
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Oct 18 17:29:58 2012 +0100

    Drop caja_remove_mate-bg-crossfade patch as it was causing crash

 mate-file-manager.spec |   36 +++++++++++++++++++++++++++++-------
 1 files changed, 29 insertions(+), 7 deletions(-)
---
diff --git a/mate-file-manager.spec b/mate-file-manager.spec
index eff6278..289717c 100644
--- a/mate-file-manager.spec
+++ b/mate-file-manager.spec
@@ -12,10 +12,11 @@
 Name:			mate-file-manager
 Summary:		File manager for MATE
 Version:		1.4.0
-Release:		7%{?dist}
+Release:		11%{?dist}
 License:		GPLv2+ and LGPLv2+
 Group:			User Interface/Desktops
-Source:			http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:		http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+
 URL:			http://mate-desktop.org
 Requires:		gamin
 Requires:		filesystem >= 2.1.1-1
@@ -36,6 +37,8 @@ BuildRequires:	unique-devel >= %{unique_version}
 BuildRequires:	mate-conf-devel >= %{mateconf_version}
 BuildRequires:	mate-common
 BuildRequires:	cairo-gobject-devel
+BuildRequires:	libxml2-devel
+BuildRequires:	dbus-glib-devel
 
 Requires(pre):		mate-conf >= %{mateconf_version}
 Requires(preun):	mate-conf >= %{mateconf_version}
@@ -60,6 +63,9 @@ 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
+Patch6:		signal_curtain.patch
+
 
 %description
 Caja (mate-file-manager) is the file manager and graphical shell
@@ -91,16 +97,17 @@ for developing caja extensions.
 
 %prep
 %setup -q
-sed -i -e 's,OnlyShowIn=MATE,OnlyShowIn=X-MATE,g' src/mate-network-scheme.desktop.in data/caja*desktop*
 sed -i -e 's,Categories=MATE,Categories=X-MATE,g' src/mate-network-scheme.desktop.in data/caja*desktop*
 
-NOCONFIGURE=1 ./autogen.sh
-
 %patch0 -p1 -b .config
 %patch1 -p1 -b .caja-rtl-fix
 %patch2 -p1 -b .gvfs-desktop-key
 %patch3 -p0 -b .symlink
-%patch4 -p1 -b .caja_remove_mate-bg-crossfade
+#%patch4 -p1 -b .caja_remove_mate-bg-crossfade
+%patch5 -p1 -b .no_session_delay
+%patch6 -p1 -b .signal_curtain.patch
+
+NOCONFIGURE=1 ./autogen.sh
 
 %build
 
@@ -152,6 +159,7 @@ 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
 
+
 %find_lang caja
 
 
@@ -190,7 +198,7 @@ fi
 %{_datadir}/applications/caja.desktop
 %{_datadir}/applications/mate-network-scheme.desktop
 %{_bindir}/*
-%config(noreplace) %{_sysconfdir}/mateconf/schemas/*
+%{_sysconfdir}/mateconf/schemas/*
 %{_datadir}/icons/hicolor/*/apps/caja.png
 %{_datadir}/icons/hicolor/scalable/apps/caja.svg
 %{_mandir}/man1/caja-connect-server.1.*
@@ -213,6 +221,20 @@ fi
 
 
 %changelog
+* Thu Oct 18 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-11
+- Drop caja_remove_mate-bg-crossfade patch as it was causing crash
+
+* Thu Oct 18 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-10
+- add patch to try and fix crash
+
+* 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
+
 * Mon Aug 20 2012 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.4.0-7
 - remove obsoleting stuff