commit 80789b35d14e465bd1338d2a2e1bb4428fe61911
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Thu May 16 07:22:03 2019 +0200
- don't require programs for build, those are used only at runtime
ka5-ark.spec | 12 +++++++-----
no-programs.patch | 47 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 54 insertions(+), 5 deletions(-)
---
diff --git a/ka5-ark.spec b/ka5-ark.spec
index 4cf541c..d11dc8d 100644
--- a/ka5-ark.spec
+++ b/ka5-ark.spec
@@ -10,6 +10,7 @@ Group: X11/Libraries
Source0:
http://download.kde.org/stable/applications/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
# Source0-md5: 8850f64c6c4374e5973804d8cb029758
Patch0: unique_ptr.patch
+Patch1: no-programs.patch
URL: http://www.kde.org/
BuildRequires: Qt5Concurrent-devel
BuildRequires: Qt5Core-devel >= %{qtver}
@@ -33,18 +34,18 @@ BuildRequires: kf5-kpty-devel >= 5.38.0
BuildRequires: kf5-kservice-devel >= 5.38.0
BuildRequires: kf5-kwidgetsaddons-devel >= 5.38.0
BuildRequires: libarchive-devel >= 3.2.0
-BuildRequires: lrzip
-BuildRequires: lzop
BuildRequires: ninja
BuildRequires: qt5-build >= %{qtver}
-BuildRequires: rar
BuildRequires: rpmbuild(macros) >= 1.164
BuildRequires: shared-mime-info
BuildRequires: tar >= 1:1.22
-BuildRequires: unrar
BuildRequires: xz-devel
BuildRequires: zlib-devel
-BuildRequires: zstd
+Suggests: lrzip
+Suggests: lzop
+Suggests: rar
+Suggests: unrar
+Suggests: zstd
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -56,6 +57,7 @@ modify archives.
%prep
%setup -q -n %{kaname}-%{version}
%patch0 -p1
+%patch1 -p1
%build
install -d build
diff --git a/no-programs.patch b/no-programs.patch
new file mode 100644
index 0000000..5b25493
--- /dev/null
+++ b/no-programs.patch
@@ -0,0 +1,47 @@
+--- ark-19.04.1/plugins/clirarplugin/CMakeLists.txt~ 2019-05-05
12:43:24.000000000 +0200
++++ ark-19.04.1/plugins/clirarplugin/CMakeLists.txt 2019-05-16
07:18:19.440090472 +0200
+@@ -24,17 +24,3 @@
+
+ set(SUPPORTED_ARK_MIMETYPES
"${SUPPORTED_ARK_MIMETYPES}${SUPPORTED_CLIRAR_MIMETYPES}" PARENT_SCOPE)
+ set(INSTALLED_KERFUFFLE_PLUGINS
"${INSTALLED_KERFUFFLE_PLUGINS}kerfuffle_clirar;" PARENT_SCOPE)
+-
+-find_program(UNRAR unrar)
+-if(UNRAR)
+- message(STATUS "Found unrar executable: ${UNRAR}")
+-else()
+- message(WARNING "Could not find the unrar executable. Ark requires unrar
or unar to extract RAR archives.")
+-endif()
+-
+-find_program(RAR rar)
+-if(RAR)
+- message(STATUS "Found rar executable: ${RAR}")
+-else()
+- message(WARNING "Could not find the rar executable. Ark won't be able to
create or edit RAR archives.")
+-endif()
+--- ark-19.04.1/plugins/libarchive/CMakeLists.txt~ 2019-05-05
12:43:24.000000000 +0200
++++ ark-19.04.1/plugins/libarchive/CMakeLists.txt 2019-05-16
07:19:27.198959602 +0200
+@@ -86,24 +86,3 @@
+
+ set(SUPPORTED_ARK_MIMETYPES
"${SUPPORTED_ARK_MIMETYPES}${SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES}${SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES}"
PARENT_SCOPE)
+ set(INSTALLED_KERFUFFLE_PLUGINS
"${INSTALLED_KERFUFFLE_PLUGINS}${INSTALLED_LIBARCHIVE_PLUGINS}" PARENT_SCOPE)
+-
+-find_program(LRZIP lrzip)
+-if(LRZIP)
+- message(STATUS "Found lrzip executable: ${LRZIP}")
+-else()
+- message(WARNING "Could not find the lrzip executable. Ark requires lrzip
to handle the tar.lrz archive format.")
+-endif()
+-
+-find_program(LZOP lzop)
+-if(LZOP)
+- message(STATUS "Found lzop executable: ${LZOP}")
+-else()
+- message(WARNING "Could not find the lzop executable. Ark requires lzop to
handle the tar.lzo archive format if libarchive >= 3.3 has been compiled
without liblzo2 support.")
+-endif()
+-
+-find_program(ZSTD zstd)
+-if(ZSTD)
+- message(STATUS "Found zstd executable: ${ZSTD}")
+-else()
+- message(WARNING "Could not find the zstd executable. Ark requires zstd to
handle the tar.zst archive format if libarchive >= 3.3.3 has been compiled
without libzstd support.")
+-endif()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ka5-ark.git/commitdiff/80789b35d14e465bd1338d2a2e1bb4428fe61911
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
