Hello community, here is the log from the commit of package ark for openSUSE:Factory checked in at 2018-12-19 13:31:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ark (Old) and /work/SRC/openSUSE:Factory/.ark.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ark" Wed Dec 19 13:31:13 2018 rev:99 rq:658320 version:18.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ark/ark.changes 2018-11-12 09:25:38.254428785 +0100 +++ /work/SRC/openSUSE:Factory/.ark.new.28833/ark.changes 2018-12-19 13:31:16.848785412 +0100 @@ -1,0 +2,55 @@ +Fri Dec 14 06:08:46 UTC 2018 - lbeltr...@kde.org + +- Update to 18.12.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12.0.php +- Changes since 18.11.90: + * No code changes since 18.11.90 + +------------------------------------------------------------------- +Mon Dec 03 20:55:45 UTC 2018 - lbeltr...@kde.org + +- Update to 18.11.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12-rc.php +- Changes since 18.11.80: + * No code changes since 18.11.80 + +------------------------------------------------------------------- +Tue Nov 20 06:21:48 UTC 2018 - Luca Beltrame <lbeltr...@kde.org> + +- Run spec-cleaner + +------------------------------------------------------------------- +Tue Nov 20 05:56:35 UTC 2018 - lbeltr...@kde.org + +- Update to 18.11.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12-beta.php +- Changes since 18.08.3: + * Add donation url to appdata + * clizip: Insert break statement + * Bump minimum Qt version to 5.8 + * Get rid of gcc warnings + * Fix zstd autotest on Jenkins + * Remove extra semicolon + * Add caption to the screenshot + * Add a missing end parenthesis + * Update copyright year + * Add support for Zstd-compressed Tar-archives + * libzipplugin: Simplify registration of progress callbacks + * Introduce default value for OperationMode enum + * Use Ark part only when mime type exactly matches a supported type (kde#398531) + * Use KDEFrameworkCompilerSettings + * Silence up false positive EBN check and fix some typos + * Use lambdas instead of QSignalMapper + * [CompressFileItemAction] Don't offer for non-local URLs + * Add new option (-m) to man page + * Add --mimetypes command line option +- Refreshed patches: + * lower-libarchive-minimum-version.patch + +------------------------------------------------------------------- @@ -49 +104 @@ - * https://www.kde.org/announcements/announce-applications-18.07.80.php + * https://www.kde.org/announcements/announce-applications-18.08-beta.php @@ -127 +182 @@ - * https://www.kde.org/announcements/announce-applications-18.03.90.php + * https://www.kde.org/announcements/announce-applications-18.04-rc.php @@ -280 +335 @@ - * https://www.kde.org/announcements/announce-applications-17.07.90.php + * https://www.kde.org/announcements/announce-applications-17.08-rc.php @@ -377 +432 @@ - * https://www.kde.org/announcements/announce-applications-17.03.80.php + * https://www.kde.org/announcements/announce-applications-17.04-beta.php @@ -526 +581 @@ - * https://www.kde.org/announcements/announce-applications-16.07.90.php + * https://www.kde.org/announcements/announce-applications-16.08-rc.php @@ -657 +712 @@ - * https://www.kde.org/announcements/announce-applications-15.07.90.php + * https://www.kde.org/announcements/announce-applications-15.08-rc.php Old: ---- ark-18.08.3.tar.xz New: ---- ark-18.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ark.spec ++++++ --- /var/tmp/diff_new_pack.oxb2hj/_old 2018-12-19 13:31:17.748784239 +0100 +++ /var/tmp/diff_new_pack.oxb2hj/_new 2018-12-19 13:31:17.752784234 +0100 @@ -1,7 +1,7 @@ # # spec file for package ark # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,27 +12,25 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%bcond_without lang - %define SOMAJOR 18 - -Name: ark -Version: 18.08.3 -Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%bcond_without lang +Name: ark +Version: 18.12.0 +Release: 0 Summary: KDE Archiver Tool -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Other -Url: http://www.kde.org +URL: http://www.kde.org Source0: ark-%{version}.tar.xz # PATCH-FIX-OPENSUSE lower-libarchive-minimum-version.patch -Patch: lower-libarchive-minimum-version.patch +Patch0: lower-libarchive-minimum-version.patch BuildRequires: extra-cmake-modules >= 1.7.0 BuildRequires: karchive-devel >= %{kf5_version} BuildRequires: kconfig-devel >= 5.2.0 @@ -40,9 +38,6 @@ BuildRequires: kf5-filesystem BuildRequires: kpty-devel >= 5.2.0 BuildRequires: libarchive-devel -%if 0%{?suse_version} >= 1330 -BuildRequires: libzip-devel >= 1.2.0 -%endif BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: xz @@ -53,20 +48,23 @@ BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 BuildRequires: pkgconfig(bzip2) -%if 0%{?suse_version} > 1500 -Recommends: p7zip-full -%else -Recommends: p7zip -%endif +Requires: shared-mime-info # Recommend the most used compression programs (bnc#872010) Recommends: xz # unrar is non-free. Avoid installing it automatically. Suggests: unrar Obsoletes: ark-devel +%if 0%{?suse_version} >= 1330 +BuildRequires: libzip-devel >= 1.2.0 +%endif +%if 0%{?suse_version} > 1500 +Recommends: p7zip-full +%else +Recommends: p7zip +%endif %if %{with lang} Recommends: %{name}-lang %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This is a KDE application to work with compressed archives. @@ -94,16 +92,21 @@ %kf5_makeinstall -C build %if %{with lang} %find_lang %{name} --with-man --all-name - %kf5_find_htmldocs + %{kf5_find_htmldocs} %endif %suse_update_desktop_file org.kde.ark System Archiving +%post +%mime_database_post + +%postun +%mime_database_postun + %post -n libkerfuffle%{SOMAJOR} -p /sbin/ldconfig %postun -n libkerfuffle%{SOMAJOR} -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc COPYING* +%license COPYING* %config %{_kf5_configdir}/ark.categories %dir %{_kf5_htmldir} %dir %{_kf5_htmldir}/en @@ -118,15 +121,15 @@ %{_kf5_servicesdir}/ %{_kf5_servicetypesdir}/ %{_kf5_sharedir}/kxmlgui5/ +%{_kf5_sharedir}/mime/packages/kerfuffle.xml %files -n libkerfuffle%{SOMAJOR} -%defattr(-,root,root) -%doc COPYING* +%license COPYING* %{_kf5_libdir}/libkerfuffle.so.* %if %{with lang} %files lang -f %{name}.lang -%doc COPYING* +%license COPYING* %endif %changelog ++++++ ark-18.08.3.tar.xz -> ark-18.12.0.tar.xz ++++++ ++++ 56451 lines of diff (skipped) ++++++ lower-libarchive-minimum-version.patch ++++++ --- /var/tmp/diff_new_pack.oxb2hj/_old 2018-12-19 13:31:18.456783316 +0100 +++ /var/tmp/diff_new_pack.oxb2hj/_new 2018-12-19 13:31:18.456783316 +0100 @@ -13,11 +13,11 @@ plugins/libarchive/readwritelibarchiveplugin.cpp | 4 ++++ 3 files changed, 24 insertions(+), 4 deletions(-) -Index: ark-17.08.2/CMakeLists.txt +Index: ark-18.11.70git.20181106T220552~74c6c250/CMakeLists.txt =================================================================== ---- ark-17.08.2.orig/CMakeLists.txt -+++ ark-17.08.2/CMakeLists.txt -@@ -60,7 +60,7 @@ if(NOT Qt5Test_FOUND) +--- ark-18.11.70git.20181106T220552~74c6c250.orig/CMakeLists.txt 2018-11-07 06:49:11.525977607 +0100 ++++ ark-18.11.70git.20181106T220552~74c6c250/CMakeLists.txt 2018-11-07 06:49:19.382032137 +0100 +@@ -59,7 +59,7 @@ set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.") endif() @@ -26,11 +26,11 @@ set_package_properties(LibArchive PROPERTIES URL "http://www.libarchive.org/"; DESCRIPTION "A library for dealing with a wide variety of archive file formats" -Index: ark-17.08.2/plugins/libarchive/CMakeLists.txt +Index: ark-18.11.70git.20181106T220552~74c6c250/plugins/libarchive/CMakeLists.txt =================================================================== ---- ark-17.08.2.orig/plugins/libarchive/CMakeLists.txt -+++ ark-17.08.2/plugins/libarchive/CMakeLists.txt -@@ -2,10 +2,15 @@ include_directories(${LibArchive_INCLUDE +--- ark-18.11.70git.20181106T220552~74c6c250.orig/plugins/libarchive/CMakeLists.txt 2018-11-07 06:49:11.557977829 +0100 ++++ ark-18.11.70git.20181106T220552~74c6c250/plugins/libarchive/CMakeLists.txt 2018-11-08 07:11:02.526531335 +0100 +@@ -6,10 +6,15 @@ ########### 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;") @@ -44,29 +44,28 @@ + 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 + if(ENABLE_ZSTD_SUPPORT) + set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "${SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES}application/x-zstd-compressed-tar;") + endif() +@@ -54,8 +59,14 @@ \"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") + \"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(ENABLE_ZSTD_SUPPORT) + set(SUPPORTED_READWRITE_MIMETYPES +@@ -78,6 +89,11 @@ + target_compile_definitions(kerfuffle_libarchive PRIVATE -DHAVE_ZSTD_SUPPORT) + endif() +if(LibArchive_VERSION VERSION_EQUAL "3.2.0" OR + LibArchive_VERSION VERSION_GREATER "3.2.0") @@ -76,11 +75,11 @@ target_link_libraries(kerfuffle_libarchive_readonly ${LibArchive_LIBRARIES}) target_link_libraries(kerfuffle_libarchive ${LibArchive_LIBRARIES}) -Index: ark-17.08.2/plugins/libarchive/readwritelibarchiveplugin.cpp +Index: ark-18.11.70git.20181106T220552~74c6c250/plugins/libarchive/readwritelibarchiveplugin.cpp =================================================================== ---- ark-17.08.2.orig/plugins/libarchive/readwritelibarchiveplugin.cpp -+++ ark-17.08.2/plugins/libarchive/readwritelibarchiveplugin.cpp -@@ -291,9 +291,11 @@ bool ReadWriteLibarchivePlugin::initiali +--- ark-18.11.70git.20181106T220552~74c6c250.orig/plugins/libarchive/readwritelibarchiveplugin.cpp 2018-11-07 06:49:19.386032165 +0100 ++++ ark-18.11.70git.20181106T220552~74c6c250/plugins/libarchive/readwritelibarchiveplugin.cpp 2018-11-07 06:59:56.489937239 +0100 +@@ -291,9 +291,11 @@ ret = archive_write_add_filter_lrzip(m_archiveWriter.data()); requiresExecutable = true; break; @@ -89,18 +88,18 @@ 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::initiali + #ifdef HAVE_ZSTD_SUPPORT + case ARCHIVE_FILTER_ZSTD: + ret = archive_write_add_filter_zstd(m_archiveWriter.data()); +@@ -348,9 +350,11 @@ 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()); + } 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()); + #ifdef HAVE_ZSTD_SUPPORT + } else if (filename().rightRef(3).compare(QLatin1String("zst"), Qt::CaseInsensitive)) { + qCDebug(ARK) << "Detected zstd compression for new file";
