From 355bc7afc2bfc73bdaa98ca32bdb56e68e1d75b09b435330ff300045529f8bb4 Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Wed, 22 Apr 2020 14:28:47 +0000
Subject: [PATCH] - Add lxqt-archiver-execdir.patch: install in helper programs
   in libexecdir not libdir

OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/lxqt-archiver?expand=0&rev=4
---
 lxqt-archiver-execdir.patch | 42 +++++++++++++++++++++++++++++++++++++
 lxqt-archiver.changes       |  6 ++++++
 lxqt-archiver.spec          | 11 +++++-----
 3 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 lxqt-archiver-execdir.patch

diff --git a/lxqt-archiver-execdir.patch b/lxqt-archiver-execdir.patch
new file mode 100644
index 0000000..151b998
--- /dev/null
+++ b/lxqt-archiver-execdir.patch
@@ -0,0 +1,42 @@
+From 8164b2339cc5f630ced87a8bd4b915a39b03e026 Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Tue, 21 Apr 2020 20:27:26 +0300
+Subject: [PATCH] CMake: Use 'LIBEXECDIR' instead of 'LIBDIR' for executables
+
+Thanks-to: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/core/CMakeLists.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index 1ae4770..2e092f9 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -5,8 +5,8 @@ include_directories(
+ )
+ 
+ add_definitions(
+-    -DSHDIR=\"${CMAKE_INSTALL_LIBDIR}/lxqt-archiver\"
+-    -DPRIVEXECDIR=\"${CMAKE_INSTALL_LIBDIR}/lxqt-archiver\"
++    -DSHDIR=\"${CMAKE_INSTALL_LIBEXECDIR}/lxqt-archiver\"
++    -DPRIVEXECDIR=\"${CMAKE_INSTALL_LIBEXECDIR}/lxqt-archiver\"
+ )
+ 
+ add_library(lxqt-archiver-core STATIC
+@@ -60,7 +60,7 @@ target_link_libraries(rpm2cpio
+ )
+ install(TARGETS
+     rpm2cpio
+-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/lxqt-archiver"
++    DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/lxqt-archiver"
+     COMPONENT Runtime
+ )
+ 
+@@ -71,6 +71,6 @@ set(SCRIPT_FILES
+ 
+ install(FILES
+     ${SCRIPT_FILES}
+-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/lxqt-archiver"
++    DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/lxqt-archiver"
+     COMPONENT Runtime
+ )
diff --git a/lxqt-archiver.changes b/lxqt-archiver.changes
index 6615916..6b7cb3b 100644
--- a/lxqt-archiver.changes
+++ b/lxqt-archiver.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 22 14:27:38 UTC 2020 - Michael Vetter <mvetter@suse.com>
+
+- Add lxqt-archiver-execdir.patch: install in helper programs
+  in libexecdir not libdir
+
 -------------------------------------------------------------------
 Wed Apr 22 08:42:41 UTC 2020 - Michael Vetter <mvetter@suse.com>
 
diff --git a/lxqt-archiver.spec b/lxqt-archiver.spec
index 4f66f02..7cbb0f5 100644
--- a/lxqt-archiver.spec
+++ b/lxqt-archiver.spec
@@ -21,11 +21,12 @@ Version:        0.1.0
 Release:        0
 Summary:        LXQt File Archiver
 License:        GPL-2.0-or-later
-# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
 Group:          System/GUI/LXQt
 URL:            http://www.lxqt.org
 Source:         https://github.com/lxqt/lxqt-archiver/archive/%{version}.tar.gz
 Source1:        lxqt-archiver.desktop
+# https://github.com/lxqt/lxqt-archiver/pull/153
+Patch0:         lxqt-archiver-execdir.patch
 BuildRequires:  cmake >= 3.1.0
 BuildRequires:  libexif-devel
 BuildRequires:  libqt5-linguist-devel
@@ -49,7 +50,7 @@ LXQt file archiver.
 
 %prep
 %setup -q
-rm src/translations/*.desktop
+%patch0 -p1
 
 %build
 %cmake
@@ -64,10 +65,10 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/
 %files
 %license LICENSE
 %doc AUTHORS CHANGELOG README.md
-%dir %{_libdir}/lxqt-archiver/
 %{_bindir}/lxqt-archiver
-%{_libdir}/lxqt-archiver/isoinfo.sh
-%{_libdir}/lxqt-archiver/rpm2cpio
+%dir %{_libexecdir}/lxqt-archiver/
+%{_libexecdir}/lxqt-archiver/isoinfo.sh
+%{_libexecdir}/lxqt-archiver/rpm2cpio
 %{_datadir}/applications/lxqt-archiver.desktop
 
 %files lang -f %{name}.lang