Hello community, here is the log from the commit of package ark for openSUSE:Factory checked in at 2017-05-08 18:45:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ark (Old) and /work/SRC/openSUSE:Factory/.ark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ark" Mon May 8 18:45:54 2017 rev:76 rq:490336 version:17.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ark/ark.changes 2017-03-15 00:50:34.952243834 +0100 +++ /work/SRC/openSUSE:Factory/.ark.new/ark.changes 2017-05-08 18:45:57.188769262 +0200 @@ -1,0 +2,43 @@ +Sun Apr 16 10:44:44 CEST 2017 - lbeltr...@kde.org + +- Update to 17.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04.0.php +- Changes since 17.03.90: + * cliunarchiver: Emit encryption method + * Fix extraction of encrypted entries with the unar plugin + +------------------------------------------------------------------- +Sat Apr 15 11:23:53 UTC 2017 - fab...@ritter-vogt.de + +- Only require libzip >= 1.2.0 on >= TW + +------------------------------------------------------------------- +Wed Apr 12 20:25:11 CEST 2017 - lbeltr...@kde.org + +- Update to 17.03.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04-rc.php +- Changes since 17.03.80: + * None + +------------------------------------------------------------------- +Mon Mar 27 12:29:46 UTC 2017 - wba...@tmo.at + +- Add lower-libarchive-minimum-version.patch, this reverts the bump + of the minimum libarchive version to 3.2.0 to make it build on + Leap 42 (with libarchive 3.1.2) + +------------------------------------------------------------------- +Sat Mar 25 23:10:06 CET 2017 - lbeltr...@kde.org + +- Update to 17.03.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.03.80.php +- Changes since 16.12.3: + * Too many changes to list here + +------------------------------------------------------------------- Old: ---- ark-16.12.3.tar.xz New: ---- ark-17.04.0.tar.xz lower-libarchive-minimum-version.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ark.spec ++++++ --- /var/tmp/diff_new_pack.hbhX9m/_old 2017-05-08 18:45:57.972658414 +0200 +++ /var/tmp/diff_new_pack.hbhX9m/_new 2017-05-08 18:45:57.972658414 +0200 @@ -15,27 +15,33 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define SOMAJOR 16 +%bcond_without lang + +%define SOMAJOR 17 Name: ark -Version: 16.12.3 +Version: 17.04.0 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.12.3 in KUA) +# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: KDE Archiver Tool License: GPL-2.0+ Group: Productivity/Other Url: http://www.kde.org Source0: ark-%{version}.tar.xz +# PATCH-FIX-OPENSUSE lower-libarchive-minimum-version.patch +Patch: lower-libarchive-minimum-version.patch BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: karchive-devel >= %{kf5_version} BuildRequires: kconfig-devel >= 5.2.0 BuildRequires: kdelibs4support-devel >= 5.2.0 BuildRequires: kf5-filesystem BuildRequires: kpty-devel >= 5.2.0 -BuildRequires: libarchive-devel >= 3.0.0 -BuildRequires: libzip-devel +BuildRequires: libarchive-devel +%if 0%{?suse_version} >= 1330 +BuildRequires: libzip-devel >= 1.2.0 +%endif BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: xz @@ -51,6 +57,7 @@ # Recommend the most used compression programs (bnc#872010) Recommends: xz Obsoletes: ark-devel +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -63,8 +70,13 @@ %description -n libkerfuffle%{SOMAJOR} This is a KDE application to work with compressed archives. +%if %{with lang} +%lang_package +%endif + %prep %setup -q +%patch -p1 %build %cmake_kf5 -d build @@ -72,6 +84,10 @@ %install %kf5_makeinstall -C build + %if %{with lang} + %find_lang %{name} --with-man --all-name + %kf5_find_htmldocs + %endif %suse_update_desktop_file org.kde.ark System Archiving %post -n libkerfuffle%{SOMAJOR} -p /sbin/ldconfig @@ -79,7 +95,7 @@ %files %defattr(-,root,root) -%doc COPYING +%doc COPYING* %{_kf5_configdir}/ark.categories %{_kf5_applicationsdir}/org.kde.ark.desktop %{_kf5_sharedir}/kxmlgui5/ @@ -99,7 +115,12 @@ %files -n libkerfuffle%{SOMAJOR} %defattr(-,root,root) -%doc COPYING +%doc COPYING* %{_kf5_libdir}/libkerfuffle.so.* +%if %{with lang} +%files lang -f %{name}.lang +%doc COPYING* +%endif + %changelog ++++++ ark-16.12.3.tar.xz -> ark-17.04.0.tar.xz ++++++ ++++ 167000 lines of diff (skipped) ++++++ lower-libarchive-minimum-version.patch ++++++ >From e8b460a6c6fd90d95fc8c7ca19f2c37fc199bdb9 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <wba...@tmo.at> Date: Mon, 27 Mar 2017 15:02:00 +0200 Subject: [PATCH] Revert "Bump libarchive minumum version to 3.2" This reverts commit 38d7c46a0264cbc037197b5401cfd094e000db9d to make it build on Leap 42 (with libarchive 3.1.2). Shouldn't make a difference when really building against libarchive 3.2.0 or higher. --- CMakeLists.txt | 2 +- plugins/libarchive/CMakeLists.txt | 22 +++++++++++++++++++--- plugins/libarchive/readwritelibarchiveplugin.cpp | 4 ++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8383134..ceb1060 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,7 @@ if(NOT Qt5Test_FOUND) set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.") endif() -find_package(LibArchive 3.2.0 REQUIRED) +find_package(LibArchive 3.1.0 REQUIRED) set_package_properties(LibArchive PROPERTIES URL "http://www.libarchive.org/"; DESCRIPTION "A library for dealing with a wide variety of archive file formats" diff --git a/plugins/libarchive/CMakeLists.txt b/plugins/libarchive/CMakeLists.txt index fa2a13d..bafe120 100644 --- a/plugins/libarchive/CMakeLists.txt +++ b/plugins/libarchive/CMakeLists.txt @@ -2,10 +2,15 @@ include_directories(${LibArchive_INCLUDE_DIRS}) ########### next target ############### set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/x-tarz;application/x-xz-compressed-tar;") -set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "${SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES}application/x-lzma-compressed-tar;application/x-lzip-compressed-tar;application/x-tzo;application/x-lrzip-compressed-tar;application/x-lz4-compressed-tar;") +set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "${SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES}application/x-lzma-compressed-tar;application/x-lzip-compressed-tar;application/x-tzo;application/x-lrzip-compressed-tar;") set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "application/vnd.debian.binary-package;application/x-deb;application/x-cd-image;application/x-bcpio;application/x-cpio;application/x-cpio-compressed;application/x-sv4cpio;application/x-sv4crc;") set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "${SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES}application/x-rpm;application/x-source-rpm;application/vnd.ms-cab-compressed;application/x-xar;application/x-iso9660-appimage;application/x-archive;") +if(LibArchive_VERSION VERSION_EQUAL "3.2.0" OR + LibArchive_VERSION VERSION_GREATER "3.2.0") + set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "${SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES}application/x-lz4-compressed-tar;") +endif() + set(INSTALLED_LIBARCHIVE_PLUGINS "") set(kerfuffle_libarchive_readonly_SRCS libarchiveplugin.cpp readonlylibarchiveplugin.cpp ark_debug.cpp) @@ -46,8 +51,14 @@ set(SUPPORTED_READWRITE_MIMETYPES \"application/x-lzma-compressed-tar\", \"application/x-lzip-compressed-tar\", \"application/x-tzo\", - \"application/x-lrzip-compressed-tar\", - \"application/x-lz4-compressed-tar") + \"application/x-lrzip-compressed-tar") + +if(LibArchive_VERSION VERSION_EQUAL "3.2.0" OR + LibArchive_VERSION VERSION_GREATER "3.2.0") + set(SUPPORTED_READWRITE_MIMETYPES + "${SUPPORTED_READWRITE_MIMETYPES}\", + \"application/x-lz4-compressed-tar") +endif() configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/kerfuffle_libarchive_readonly.json.cmake @@ -60,6 +71,11 @@ configure_file( kerfuffle_add_plugin(kerfuffle_libarchive_readonly ${kerfuffle_libarchive_readonly_SRCS}) kerfuffle_add_plugin(kerfuffle_libarchive ${kerfuffle_libarchive_readwrite_SRCS}) +if(LibArchive_VERSION VERSION_EQUAL "3.2.0" OR + LibArchive_VERSION VERSION_GREATER "3.2.0") + target_compile_definitions(kerfuffle_libarchive PRIVATE -DHAVE_LIBARCHIVE_3_2_0) +endif() + target_link_libraries(kerfuffle_libarchive_readonly ${LibArchive_LIBRARIES}) target_link_libraries(kerfuffle_libarchive ${LibArchive_LIBRARIES}) diff --git a/plugins/libarchive/readwritelibarchiveplugin.cpp b/plugins/libarchive/readwritelibarchiveplugin.cpp index b3f4e63..f71b7a7 100644 --- a/plugins/libarchive/readwritelibarchiveplugin.cpp +++ b/plugins/libarchive/readwritelibarchiveplugin.cpp @@ -291,9 +291,11 @@ bool ReadWriteLibarchivePlugin::initializeWriterFilters() ret = archive_write_add_filter_lrzip(m_archiveWriter.data()); requiresExecutable = true; break; +#ifdef HAVE_LIBARCHIVE_3_2_0 case ARCHIVE_FILTER_LZ4: ret = archive_write_add_filter_lz4(m_archiveWriter.data()); break; +#endif case ARCHIVE_FILTER_NONE: ret = archive_write_add_filter_none(m_archiveWriter.data()); break; @@ -343,9 +345,11 @@ bool ReadWriteLibarchivePlugin::initializeNewFileWriterFilters(const Compression qCDebug(ARK) << "Detected lrzip compression for new file"; ret = archive_write_add_filter_lrzip(m_archiveWriter.data()); requiresExecutable = true; +#ifdef HAVE_LIBARCHIVE_3_2_0 } else if (filename().right(3).toUpper() == QLatin1String("LZ4")) { qCDebug(ARK) << "Detected lz4 compression for new file"; ret = archive_write_add_filter_lz4(m_archiveWriter.data()); +#endif } else if (filename().right(3).toUpper() == QLatin1String("TAR")) { qCDebug(ARK) << "Detected no compression for new file (pure tar)"; ret = archive_write_add_filter_none(m_archiveWriter.data()); -- 2.10.2
