rpm/lxqt-archiver
SHA256
1
0
Fork 0
forked from pool/lxqt-archiver
Code Pull Requests Activity

- Add lxqt-archiver-execdir.patch: install in helper programs

Browse Source 
in libexecdir not libdir

OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/lxqt-archiver?expand=0&rev=4
This commit is contained in:
Michael Vetter 2020-04-22 14:28:47 +00:00 committed by Git OBS Bridge
parent f8769df03b
commit 355bc7afc2
3 changed files with 54 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lxqt-archiver-execdir.patch Normal file
View File

@ -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
)

6
lxqt-archiver.changes
View File

@ -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>

11
lxqt-archiver.spec
View File

@ -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