[mate-file-manager/f19: 13/13] fix merge conflicts

[Wolfgang Ulbrich]

commit 9009aac15783b9d6c6ad7fb1bd048692dc6a15b1
Merge: 7256a84 954a385
Author: raveit65 <chat-to-me at raveit.de>
Date:   Tue Apr 1 18:59:40 2014 +0200

    fix merge conflicts

 .gitignore                                 |    4 -
 mate-file-manager.spec                     |   36 +++--
 mate-file-manager_remove-ck-usage.patch    |  205 ++++++++++++++++++++++++++++
 mate-file-manager_x-caja-windows-fix.patch |   90 ++++++++++++
 4 files changed, 317 insertions(+), 18 deletions(-)
---
diff --cc mate-file-manager.spec
index cad770d,4368002..87ef4ad
--- a/mate-file-manager.spec
+++ b/mate-file-manager.spec
@@@ -4,7 -4,7 +4,11 @@@ Name:       mate-file-manage
  Summary:    File manager for MATE
  Version:    1.6.4
  #Release:    0.10.git%%{_internal_version}%{?dist}
++<<<<<<< HEAD
 +Release:    1%{?dist}
++=======
+ Release:    2%{?dist}
++>>>>>>> f20
  License:    GPLv2+ and LGPLv2+
  Group:      User Interface/Desktops
  URL:        http://mate-desktop.org
@@@ -136,8 -131,6 +135,11 @@@ rm -f $RPM_BUILD_ROOT%{_datadir}/icons/
  
  mkdir -p $RPM_BUILD_ROOT%{_libdir}/caja/extensions-2.0
  
++<<<<<<< HEAD
 +desktop-file-install --dir=$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart %{SOURCE1}
 +
++=======
++>>>>>>> f20
  desktop-file-install                                \
      --delete-original                               \
      --dir=$RPM_BUILD_ROOT%{_datadir}/applications   \
@@@ -213,8 -201,14 +210,19 @@@ f
  
  
  %changelog
++<<<<<<< HEAD
 +* Sun Feb 23 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.4-1
 +- test build
++=======
+ * Tue Apr 1 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.4-2
+ - add upstream patch for fixing x-caja-windows issue
+ - end of a long story :)
+ - add remove-ck-usage upstream patch
+ - don't use caja-autostart script anymore
+ - switch back to matesession usage
+ 
+ * Fri Mar 14 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.4-1
++>>>>>>> f20
  - update to 1.6.4 release
  - remove non existent COPYING-DOCS file
  - add missing update-desktop-database rpm scriptlets