Hello community, here is the log from the commit of package krename for openSUSE:Factory checked in at 2020-07-14 07:55:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krename (Old) and /work/SRC/openSUSE:Factory/.krename.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krename" Tue Jul 14 07:55:49 2020 rev:37 rq:820424 version:5.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/krename/krename.changes 2019-01-10 15:23:22.550328298 +0100 +++ /work/SRC/openSUSE:Factory/.krename.new.3060/krename.changes 2020-07-14 07:58:30.325637289 +0200 @@ -1,0 +2,7 @@ +Sat Jul 11 13:56:25 UTC 2020 - Wolfgang Bauer <[email protected]> + +- Add use-local-cmake-modules-first.patch to fix build with KDE + Frameworks 5.72.0 +- Remove no longer necessary workaround for podofo 0.9.5 + +------------------------------------------------------------------- New: ---- use-local-cmake-modules-first.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krename.spec ++++++ --- /var/tmp/diff_new_pack.bZ6TYr/_old 2020-07-14 07:58:31.477641019 +0200 +++ /var/tmp/diff_new_pack.bZ6TYr/_new 2020-07-14 07:58:31.477641019 +0200 @@ -34,6 +34,8 @@ Patch4: 0003-Fix-the-previous-commits-and-the-build-with-exiv2-0..patch # PATCH-FIX-OPENSUSE Patch5: lower-minimum-cmake-version.patch +# PATCH-FIX-UPSTREAM +Patch6: use-local-cmake-modules-first.patch BuildRequires: extra-cmake-modules BuildRequires: freetype2-devel BuildRequires: kcompletion-devel @@ -57,10 +59,6 @@ BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(taglib) -%if 0%{?suse_version} >= 1500 -# podofo 0.9.5 needs openssl-devel by mistake, should be fixed in 0.9.6 -BuildRequires: openssl-devel -%endif %description KRename is a batch renamer by KDE. It allows renaming many files in ++++++ use-local-cmake-modules-first.patch ++++++ >From c1e0259445f32516785a6cb6e82e7cb401b6df37 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell <[email protected]> Date: Fri, 19 Jun 2020 16:44:47 +0100 Subject: [PATCH] use local cmake modules first, fixes build failure --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 602129b..4550621 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project(krename) cmake_minimum_required(VERSION 3.0) # search packages used by KDE find_package(ECM 0.0.11 REQUIRED NO_MODULE) -set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +set(CMAKE_MODULE_PATH ${ECM_KDE_MODULE_DIR} ${ECM_MODULE_PATH}) include(KDEInstallDirs) include(ECMInstallIcons) @@ -28,8 +28,8 @@ find_package(KF5 REQUIRED COMPONENTS XmlGui ) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} - ${CMAKE_SOURCE_DIR}/cmake/modules) +set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules + ${CMAKE_MODULE_PATH}) add_definitions( -DQT_DEPRECATED_WARNINGS -- GitLab
