From a0673995867b1c79fdd4bc01c54b226f674493b4639abfc565df34739230d790 Mon Sep 17 00:00:00 2001 From: Petr Vanek Date: Mon, 27 Apr 2020 06:11:41 +0000 Subject: [PATCH] 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 --- 0.1.0.tar.gz | 3 --- lxqt-archiver-0.1.1.tar.gz | 3 +++ lxqt-archiver-execdir.patch | 42 ------------------------------------- lxqt-archiver.changes | 9 ++++++++ lxqt-archiver.spec | 15 ++++++------- 5 files changed, 18 insertions(+), 54 deletions(-) delete mode 100644 0.1.0.tar.gz create mode 100644 lxqt-archiver-0.1.1.tar.gz delete mode 100644 lxqt-archiver-execdir.patch diff --git a/0.1.0.tar.gz b/0.1.0.tar.gz deleted file mode 100644 index bf92309..0000000 --- a/0.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c43ce738223a9dac7951c618d89c20db6dd2ddf8534cc2f00c5bbbd7d6e0ea0 -size 229072 diff --git a/lxqt-archiver-0.1.1.tar.gz b/lxqt-archiver-0.1.1.tar.gz new file mode 100644 index 0000000..46d6c6b --- /dev/null +++ b/lxqt-archiver-0.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00a967427428951096eb2f4a9b5fc492dde6e7c8405cffc7dc4460f77d7686bd +size 229263 diff --git a/lxqt-archiver-execdir.patch b/lxqt-archiver-execdir.patch deleted file mode 100644 index 151b998..0000000 --- a/lxqt-archiver-execdir.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8164b2339cc5f630ced87a8bd4b915a39b03e026 Mon Sep 17 00:00:00 2001 -From: Jimi Huotari -Date: Tue, 21 Apr 2020 20:27:26 +0300 -Subject: [PATCH] CMake: Use 'LIBEXECDIR' instead of 'LIBDIR' for executables - -Thanks-to: Andreas Sturmlechner ---- - 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 6b7cb3b..ee5316d 100644 --- a/lxqt-archiver.changes +++ b/lxqt-archiver.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Apr 25 10:36:39 UTC 2020 - Callum Farmer + +- 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 diff --git a/lxqt-archiver.spec b/lxqt-archiver.spec index 56dc40c..d0bc672 100644 --- a/lxqt-archiver.spec +++ b/lxqt-archiver.spec @@ -17,28 +17,25 @@ Name: lxqt-archiver -Version: 0.1.0 +Version: 0.1.1 Release: 0 Summary: LXQt File Archiver License: GPL-2.0-or-later Group: System/GUI/LXQt 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 -# 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 -BuildRequires: lxqt-build-tools-devel >= 0.6.0 +BuildRequires: lxqt-build-tools-devel >= 0.7.0 BuildRequires: pkgconfig -BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5UiTools) -BuildRequires: pkgconfig(Qt5Widgets) >= 5.7.1 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.10.0 BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(glib-2.0) >= 2.50.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(pre): desktop-file-utils Recommends: %{name}-lang @@ -50,7 +47,6 @@ LXQt file archiver. %prep %setup -q -%patch0 -p1 %build %cmake @@ -66,6 +62,7 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/ %license LICENSE %doc AUTHORS CHANGELOG README.md %{_bindir}/lxqt-archiver +%dir /usr/libexec %dir /usr/libexec/lxqt-archiver/ /usr/libexec/lxqt-archiver/isoinfo.sh /usr/libexec/lxqt-archiver/rpm2cpio