[mate-file-archiver/f20] update spec file

[Wolfgang Ulbrich]

commit bf777ee4db27e9bca27bbe8e39191fabe3bc011e
Author: raveit65 <chat-to-me at raveit.de>
Date:   Wed Feb 12 22:19:19 2014 +0100

    update spec file

 mate-file-archiver.spec |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/mate-file-archiver.spec b/mate-file-archiver.spec
index a64af4e..81e3d9f 100644
--- a/mate-file-archiver.spec
+++ b/mate-file-archiver.spec
@@ -2,7 +2,7 @@
 
 Name:           mate-file-archiver
 Version:        1.6.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 #Release:        0.1.git%{_internal_version}%{?dist}
 Summary:        MATE Desktop file archiver
 License:        GPLv2+ and LGPLv2+
@@ -17,10 +17,12 @@ Source0:        http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.
 # upstream patches
 Patch0:        mate-file-archiver_add-windows-imaging-format-wim-swm.patch
 Patch1:        mate-file-archiver_add-7z-changed-the-compression-level-options.patch
-Patch2:        mate-file-archiver_add-microsoft-cabinet-to-supported-mime-types .patch
+Patch2:        mate-file-archiver_add-microsoft-cabinet-to-supported-mime-types.patch
 Patch3:        mate-file-archiver_add-ar-files-as-supported.patch
 # https://github.com/mate-desktop/engrampa/commit/9e5599ba0b6a8b9b6b82d001232220a46a66488d
 Patch4:        mate-file-archiver_fix-directories.patch
+# https://github.com/mate-desktop/engrampa/commit/4cf52a3722472428154559a7102cd8e7e4b05372
+Patch5:        mate-file-archiver_fix-directories-2.patch
 
 BuildRequires:  mate-common
 BuildRequires:  desktop-file-utils
@@ -56,8 +58,9 @@ such as tar or zip files.
 %patch2 -p1 -b .cabinet
 %patch3 -p1 -b .ar
 %patch4 -p1 -b .directories
+%patch5 -p1 -b .directories2
 
-# needed for patch 4
+# needed for patch 4/5
 autoreconf -fi
 
 # nedded to create missing configure and make files
@@ -88,12 +91,12 @@ find %{buildroot} -name "*.la" -exec rm -f {} ';'
 rm -f  %{buildroot}%{_datadir}/MateConf/gsettings/engrampa.convert
 
 # move icons to hicolor dir
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/16x16/actions
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/24x24/actions
-mv -f %{buildroot}%{_datadir}/engrampa/icons/hicolor/16x16/actions/*.png \
-%{buildroot}%{_datadir}/icons/hicolor/16x16/actions/
-mv -f %{buildroot}%{_datadir}/engrampa/icons/hicolor/24x24/actions/*.png \
-%{buildroot}%{_datadir}/icons/hicolor/24x24/actions/
+#mkdir -p %{buildroot}%{_datadir}/icons/hicolor/16x16/actions
+#mkdir -p %{buildroot}%{_datadir}/icons/hicolor/24x24/actions
+#mv -f %{buildroot}%{_datadir}/engrampa/icons/hicolor/16x16/actions/*.png \
+#%{buildroot}%{_datadir}/icons/hicolor/16x16/actions/
+#mv -f %{buildroot}%{_datadir}/engrampa/icons/hicolor/24x24/actions/*.png \
+#%{buildroot}%{_datadir}/icons/hicolor/24x24/actions/
 
 %find_lang engrampa
 
@@ -124,14 +127,15 @@ fi
 %{_datadir}/applications/engrampa.desktop
 %{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
-%{_datadir}/icons/hicolor/*/actions/*.png
-%{_datadir}/engrampa/icons/hicolor/
 %{_datadir}/glib-2.0/schemas/org.mate.engrampa.gschema.xml
 %{_libdir}/caja/extensions-2.0/libcaja-engrampa.so
 %{_datadir}/omf/engrampa/
 
 
 %changelog
+* Wed Feb 12 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-3
+- ultimate fix for directories
+
 * Sat Feb 01 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-2
 - fix directories
 - add p7zip runtime require for cabinet and wim file support