Hello community, here is the log from the commit of package karchive for openSUSE:Factory checked in at 2017-08-24 17:53:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/karchive (Old) and /work/SRC/openSUSE:Factory/.karchive.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "karchive" Thu Aug 24 17:53:37 2017 rev:44 rq:516657 version:5.37.0 Changes: -------- --- /work/SRC/openSUSE:Factory/karchive/karchive.changes 2017-07-17 10:22:35.936075956 +0200 +++ /work/SRC/openSUSE:Factory/.karchive.new/karchive.changes 2017-08-24 17:55:41.252632761 +0200 @@ -1,0 +2,12 @@ +Sat Aug 12 09:23:16 UTC 2017 - [email protected] + +- Update to 5.37.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.37.0.php +- Changes since 5.36.0 : + * Add Conan files + * Add categories + * We need to compare it. it's not a boolean + +------------------------------------------------------------------- Old: ---- karchive-5.36.0.tar.xz New: ---- karchive-5.37.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ karchive.spec ++++++ --- /var/tmp/diff_new_pack.jXHAVq/_old 2017-08-24 17:55:41.752562346 +0200 +++ /var/tmp/diff_new_pack.jXHAVq/_new 2017-08-24 17:55:41.756561783 +0200 @@ -17,9 +17,9 @@ %define lname libKF5Archive5 -%define _tar_path 5.36 +%define _tar_path 5.37 Name: karchive -Version: 5.36.0 +Version: 5.37.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_tar_path} @@ -88,6 +88,7 @@ %files -n %lname %defattr(-,root,root) %doc COPYING* README* +%config %{_kf5_configdir}/karchive.categories %{_kf5_libdir}/libKF5Archive.so.* %files devel ++++++ karchive-5.36.0.tar.xz -> karchive-5.37.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.36.0/CMakeLists.txt new/karchive-5.37.0/CMakeLists.txt --- old/karchive-5.36.0/CMakeLists.txt 2017-06-30 12:17:45.000000000 +0200 +++ new/karchive-5.37.0/CMakeLists.txt 2017-08-06 18:27:20.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.36.0") # handled by release scripts +set(KF5_VERSION "5.37.0") # handled by release scripts project(KArchive VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.36.0 NO_MODULE) +find_package(ECM 5.37.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -18,7 +18,7 @@ include(GenerateExportHeader) -set(REQUIRED_QT_VERSION 5.6.0) +set(REQUIRED_QT_VERSION 5.7.0) find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) find_package(ZLIB) @@ -102,4 +102,6 @@ FILE KF5ArchiveTargets.cmake NAMESPACE KF5::) +install(FILES karchive.categories DESTINATION ${KDE_INSTALL_CONFDIR}) + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.36.0/conanfile.py new/karchive-5.37.0/conanfile.py --- old/karchive-5.36.0/conanfile.py 1970-01-01 01:00:00.000000000 +0100 +++ new/karchive-5.37.0/conanfile.py 2017-08-06 18:27:20.000000000 +0200 @@ -0,0 +1,31 @@ +from conans import ConanFile, CMake, tools + +class KArchiveConan(ConanFile): + name = "KArchive" + version = "5.37.0" + license = "LGPL-2.1" + url = "https://api.kde.org/frameworks/karchive/html/index.html"; + settings = "os", "compiler", "build_type", "arch" + + # build this as shared library by default, but static builds are an option + options = {"shared": [True, False]} + default_options = "shared=True" + generators = "cmake" + exports_sources = "*" + + def build(self): + cmake = CMake(self) + + # change the library install dir to just "lib" as that's what Conan expects in its packages + args = ['-DCMAKE_INSTALL_PREFIX="%s"' % self.package_folder, + '-DKDE_INSTALL_LIBDIR=lib'] + self.run('cmake %s %s %s' % (self.source_folder, cmake.command_line, " ".join(args))) + self.run("cmake --build . --target install %s" % cmake.build_config) + + def package(self): + # ideally nothing here, cmake with install takes care of it + pass + + def package_info(self): + self.cpp_info.libs = ["KF5Archive"] + self.cpp_info.includedirs = ['include/KF5', 'include/KF5/KArchive'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.36.0/karchive.categories new/karchive-5.37.0/karchive.categories --- old/karchive-5.36.0/karchive.categories 1970-01-01 01:00:00.000000000 +0100 +++ new/karchive-5.37.0/karchive.categories 2017-08-06 18:27:20.000000000 +0200 @@ -0,0 +1 @@ +kf5.karchive KArchive diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.36.0/src/kxzfilter.cpp new/karchive-5.37.0/src/kxzfilter.cpp --- old/karchive-5.36.0/src/kxzfilter.cpp 2017-06-30 12:17:45.000000000 +0200 +++ new/karchive-5.37.0/src/kxzfilter.cpp 2017-08-06 18:27:20.000000000 +0200 @@ -166,7 +166,7 @@ if (flag == AUTO) { result = lzma_easy_encoder(&d->zStream, LZMA_PRESET_DEFAULT, LZMA_CHECK_CRC32); } else { - if (LZMA2) { + if (flag == LZMA2) { lzma_options_lzma lzma_opt; lzma_lzma_preset(&lzma_opt, LZMA_PRESET_DEFAULT); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.36.0/test_package/CMakeLists.txt new/karchive-5.37.0/test_package/CMakeLists.txt --- old/karchive-5.36.0/test_package/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/karchive-5.37.0/test_package/CMakeLists.txt 2017-08-06 18:27:20.000000000 +0200 @@ -0,0 +1,13 @@ +project(PackageTest CXX) +cmake_minimum_required(VERSION 2.8.12) + +include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) +conan_basic_setup() + +find_package(Qt5 5.6 CONFIG REQUIRED + Core +) + +add_executable(example example.cpp) +target_link_libraries(example ${CONAN_LIBS} + Qt5::Core) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.36.0/test_package/conanfile.py new/karchive-5.37.0/test_package/conanfile.py --- old/karchive-5.36.0/test_package/conanfile.py 1970-01-01 01:00:00.000000000 +0100 +++ new/karchive-5.37.0/test_package/conanfile.py 2017-08-06 18:27:20.000000000 +0200 @@ -0,0 +1,20 @@ +from conans import ConanFile, CMake +import os + +class KArchiveTestConan(ConanFile): + settings = "os", "compiler", "build_type", "arch" + generators = "cmake" + + def build(self): + cmake = CMake(self) + # Current dir is "test_package/build/<build_id>" and CMakeLists.txt is in "test_package" + cmake.configure(source_dir=self.conanfile_directory, build_dir="./") + cmake.build() + + def imports(self): + self.copy("*.dll", dst="bin", src="bin") + self.copy("*.dylib*", dst="bin", src="lib") + + def test(self): + os.chdir("bin") + self.run(".%sexample" % os.sep) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/karchive-5.36.0/test_package/example.cpp new/karchive-5.37.0/test_package/example.cpp --- old/karchive-5.36.0/test_package/example.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/karchive-5.37.0/test_package/example.cpp 2017-08-06 18:27:20.000000000 +0200 @@ -0,0 +1,7 @@ +#include <QtCore/QIODevice> +#include "kzip.h" + +int main() { + KZip a("somefile"); + return 0; +}
