forked from pool/lxqt-archiver
Accepting request 797678 from home:gmbr3:branches:X11:LXQt
- Removed lxqt-archiver-execdir.patch: contained in upstream - Update to version 0.1.1 * Removed the unused qtdbus dependency. * Used 'LIBEXECDIR' instead of 'LIBDIR' for internal executables. * Fixed handling of RPM archives. OBS-URL: https://build.opensuse.org/request/show/797678 OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/lxqt-archiver?expand=0&rev=6
This commit is contained in:
parent
5c660ff9fe
commit
a067399586
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:0c43ce738223a9dac7951c618d89c20db6dd2ddf8534cc2f00c5bbbd7d6e0ea0
|
|
||||||
size 229072
|
|
3
lxqt-archiver-0.1.1.tar.gz
Normal file
3
lxqt-archiver-0.1.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:00a967427428951096eb2f4a9b5fc492dde6e7c8405cffc7dc4460f77d7686bd
|
||||||
|
size 229263
|
@ -1,42 +0,0 @@
|
|||||||
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
|
|
||||||
)
|
|
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Apr 25 10:36:39 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
|
||||||
|
|
||||||
|
- Removed lxqt-archiver-execdir.patch: contained in upstream
|
||||||
|
- Update to version 0.1.1
|
||||||
|
* Removed the unused qtdbus dependency.
|
||||||
|
* Used 'LIBEXECDIR' instead of 'LIBDIR' for internal executables.
|
||||||
|
* Fixed handling of RPM archives.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 22 14:27:38 UTC 2020 - Michael Vetter <mvetter@suse.com>
|
Wed Apr 22 14:27:38 UTC 2020 - Michael Vetter <mvetter@suse.com>
|
||||||
|
|
||||||
|
@ -17,28 +17,25 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: lxqt-archiver
|
Name: lxqt-archiver
|
||||||
Version: 0.1.0
|
Version: 0.1.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: LXQt File Archiver
|
Summary: LXQt File Archiver
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
Group: System/GUI/LXQt
|
Group: System/GUI/LXQt
|
||||||
URL: http://www.lxqt.org
|
URL: http://www.lxqt.org
|
||||||
Source: https://github.com/lxqt/lxqt-archiver/archive/%{version}.tar.gz
|
Source: https://github.com/lxqt/lxqt-archiver/archive/%{name}-%{version}.tar.gz
|
||||||
Source1: lxqt-archiver.desktop
|
Source1: lxqt-archiver.desktop
|
||||||
# https://github.com/lxqt/lxqt-archiver/pull/153
|
|
||||||
Patch0: lxqt-archiver-execdir.patch
|
|
||||||
BuildRequires: cmake >= 3.1.0
|
BuildRequires: cmake >= 3.1.0
|
||||||
BuildRequires: libexif-devel
|
BuildRequires: libexif-devel
|
||||||
BuildRequires: libqt5-linguist-devel
|
BuildRequires: libqt5-linguist-devel
|
||||||
BuildRequires: lxqt-build-tools-devel >= 0.6.0
|
BuildRequires: lxqt-build-tools-devel >= 0.7.0
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: pkgconfig(Qt5DBus)
|
|
||||||
BuildRequires: pkgconfig(Qt5UiTools)
|
BuildRequires: pkgconfig(Qt5UiTools)
|
||||||
BuildRequires: pkgconfig(Qt5Widgets) >= 5.7.1
|
BuildRequires: pkgconfig(Qt5Widgets) >= 5.10.0
|
||||||
BuildRequires: pkgconfig(Qt5X11Extras)
|
BuildRequires: pkgconfig(Qt5X11Extras)
|
||||||
BuildRequires: pkgconfig(glib-2.0) >= 2.50.0
|
BuildRequires: pkgconfig(glib-2.0) >= 2.50.0
|
||||||
BuildRequires: pkgconfig(json-glib-1.0)
|
BuildRequires: pkgconfig(json-glib-1.0)
|
||||||
BuildRequires: pkgconfig(libfm-qt) >= 0.14.1
|
BuildRequires: pkgconfig(libfm-qt) >= 0.15.0
|
||||||
Requires(post): desktop-file-utils
|
Requires(post): desktop-file-utils
|
||||||
Requires(pre): desktop-file-utils
|
Requires(pre): desktop-file-utils
|
||||||
Recommends: %{name}-lang
|
Recommends: %{name}-lang
|
||||||
@ -50,7 +47,6 @@ LXQt file archiver.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake
|
%cmake
|
||||||
@ -66,6 +62,7 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/
|
|||||||
%license LICENSE
|
%license LICENSE
|
||||||
%doc AUTHORS CHANGELOG README.md
|
%doc AUTHORS CHANGELOG README.md
|
||||||
%{_bindir}/lxqt-archiver
|
%{_bindir}/lxqt-archiver
|
||||||
|
%dir /usr/libexec
|
||||||
%dir /usr/libexec/lxqt-archiver/
|
%dir /usr/libexec/lxqt-archiver/
|
||||||
/usr/libexec/lxqt-archiver/isoinfo.sh
|
/usr/libexec/lxqt-archiver/isoinfo.sh
|
||||||
/usr/libexec/lxqt-archiver/rpm2cpio
|
/usr/libexec/lxqt-archiver/rpm2cpio
|
||||||
|
Loading…
x
Reference in New Issue
Block a user