[mate-file-archiver/f20] removed upstreamed patches
Wolfgang Ulbrich
raveit65 at fedoraproject.org
Mon Feb 17 21:06:58 UTC 2014
commit 662759c75ed0785f74a50c57775451d462d79f27
Author: raveit65 <chat-to-me at raveit.de>
Date: Mon Feb 17 22:07:37 2014 +0100
removed upstreamed patches
mate-file-archiver.spec | 21 +++------------------
1 files changed, 3 insertions(+), 18 deletions(-)
---
diff --git a/mate-file-archiver.spec b/mate-file-archiver.spec
index 56b67e1..e8c2d17 100644
--- a/mate-file-archiver.spec
+++ b/mate-file-archiver.spec
@@ -19,10 +19,6 @@ 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
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
@@ -57,11 +53,6 @@ such as tar or zip files.
%patch1 -p1 -b .7z
%patch2 -p1 -b .cabinet
%patch3 -p1 -b .ar
-%patch4 -p1 -b .directories
-%patch5 -p1 -b .directories2
-
-# needed for patch 4/5
-autoreconf -fi
# nedded to create missing configure and make files
#NOCONFIGURE=1 ./autogen.sh
@@ -87,19 +78,12 @@ desktop-file-install \
find %{buildroot} -name "*.la" -exec rm -f {} ';'
-# remove needless gsettings convert file to avoid slow session start
+# remove needless gsettings convert file
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/
-
%find_lang engrampa
+
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
/usr/bin/update-desktop-database &> /dev/null || :
@@ -135,6 +119,7 @@ fi
%changelog
* Mon Feb 17 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.2-1
- update to 1.6.2 release
+- remove upstreamed patches
* Wed Feb 12 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.1-3
- ultimate fix for directories
More information about the scm-commits
mailing list