From 1f83afd30520f90a1e80c2689eed4a974ea01471 Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Feb 11 2014 21:58:26 +0000 Subject: import ark-4.10.5-4.el7.src.rpm --- diff --git a/SOURCES/ark-4.10.5-misc.patch b/SOURCES/ark-4.10.5-misc.patch new file mode 100644 index 0000000..d79fa4e --- /dev/null +++ b/SOURCES/ark-4.10.5-misc.patch @@ -0,0 +1,14 @@ +diff -up ark-4.10.5/plugins/CMakeLists.txt.than ark-4.10.5/plugins/CMakeLists.txt +--- ark-4.10.5/plugins/CMakeLists.txt.than 2014-02-10 16:27:56.907948243 +0100 ++++ ark-4.10.5/plugins/CMakeLists.txt 2014-02-10 16:28:32.111948772 +0100 +@@ -19,10 +19,7 @@ if (LIBARCHIVE_FOUND) + endif( HAVE_LIBARCHIVE_READ_DISK_API ) + endif (LIBARCHIVE_FOUND) + +-add_subdirectory( clirarplugin ) +-add_subdirectory( cli7zplugin ) + add_subdirectory( clizipplugin ) + add_subdirectory( libsinglefileplugin ) +-add_subdirectory( clilhaplugin ) + + set(SUPPORTED_ARK_MIMETYPES "${SUPPORTED_ARK_MIMETYPES}" PARENT_SCOPE) diff --git a/SPECS/ark.spec b/SPECS/ark.spec index 43db821..91cccd8 100644 --- a/SPECS/ark.spec +++ b/SPECS/ark.spec @@ -5,7 +5,7 @@ Name: ark Summary: Archive manager Version: 4.10.5 -Release: 1%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://utils.kde.org/projects/ark @@ -20,11 +20,16 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar ## upstreamable patches # libkerfuffle namelink_skip Patch50: ark-4.7.80-namelink_skip.patch + # https://git.reviewboard.kde.org/r/107635/ Patch52: ark-4.9.97-r107635.patch + # https://git.reviewboard.kde.org/r/107634/ Patch53: ark-4.9.97-improve_subfolder_autodetection.patch +# drop lha/rar/7z, we don't have it in rhel +Patch54: ark-4.10.5-misc.patch + ## upstream patches BuildRequires: bzip2-devel @@ -75,7 +80,9 @@ Provides: kdeutils-ark-libs = 6:%{version}-%{release} %patch50 -p1 -b .namelink_skip %patch52 -p1 -b .r107635 %patch53 -p1 -b .improve_subfolder_autodetection - +%if 0%{?rhel} +%patch54 -p1 -b .misc +%endif %build mkdir -p %{_target_platform} @@ -134,6 +141,15 @@ fi %changelog +* Mon Feb 10 2014 Than Ngo - 4.10.5-4 +- don't include rar/7z/lha plugins in rhel + +* Fri Jan 24 2014 Daniel Mach - 4.10.5-3 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 4.10.5-2 +- Mass rebuild 2013-12-27 + * Sun Jun 30 2013 Than Ngo - 4.10.5-1 - 4.10.5