Hello community, here is the log from the commit of package krename for openSUSE:Factory checked in at 2019-01-03 18:08:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krename (Old) and /work/SRC/openSUSE:Factory/.krename.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "krename" Thu Jan 3 18:08:25 2019 rev:35 rq:662427 version:5.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/krename/krename.changes 2018-02-16 21:45:03.062268143 +0100 +++ /work/SRC/openSUSE:Factory/.krename.new.28833/krename.changes 2019-01-03 18:08:29.784040776 +0100 @@ -1,0 +2,15 @@ +Wed Jan 2 09:58:56 UTC 2019 - wbauer@tmo.at + +- Add upstream patches to add support for exiv2-0.27: + * 0001-Use-cmakedefine01-instead-of-macro_bool_to_01.patch + * 0002-Fix-building-against-exiv2-0.27.patch + * 0003-Fix-the-previous-commits-and-the-build-with-exiv2-0..patch +- Add lower-minimum-cmake-version.patch for Leap 42.3 to make it + build with the older cmake version (3.5.2) +- Update servicemenus-files.patch and remove-gplv2-code.diff to + conform to -p1 and use "%autopatch -p1" to apply all patches +- Add missing Qt5Test build requirement +- Change URL to userbase.kde.org, krename.net is a bit outdated +- Run spec-cleaner + +------------------------------------------------------------------- New: ---- 0001-Use-cmakedefine01-instead-of-macro_bool_to_01.patch 0002-Fix-building-against-exiv2-0.27.patch 0003-Fix-the-previous-commits-and-the-build-with-exiv2-0..patch lower-minimum-cmake-version.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krename.spec ++++++ --- /var/tmp/diff_new_pack.z5MY8D/_old 2019-01-03 18:08:30.396040232 +0100 +++ /var/tmp/diff_new_pack.z5MY8D/_new 2019-01-03 18:08:30.396040232 +0100 @@ -1,7 +1,7 @@ # # spec file for package krename # -# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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,7 +12,7 @@ # 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/ # @@ -20,14 +20,20 @@ Version: 5.0.0 Release: 0 Summary: A Powerful Batch Renamer by KDE -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/File utilities -Url: http://www.krename.net/ +URL: https://userbase.kde.org/KRename Source0: https://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM servicemenus-files.patch asterios.dramis@gmail.com -- Make the desktop files KDE and XDG compatible Patch0: servicemenus-files.patch # PATCH-FIX-UPSTREAM remove-gplv2-code.diff dmueller@suse.de -- Remove GPLv2 only code (only used for self-testing) Patch1: remove-gplv2-code.diff +# PATCH-FIX-UPSTREAM -- add support for exiv2 >= 0.27 +Patch2: 0001-Use-cmakedefine01-instead-of-macro_bool_to_01.patch +Patch3: 0002-Fix-building-against-exiv2-0.27.patch +Patch4: 0003-Fix-the-previous-commits-and-the-build-with-exiv2-0..patch +# PATCH-FIX-OPENSUSE +Patch5: lower-minimum-cmake-version.patch BuildRequires: extra-cmake-modules BuildRequires: freetype2-devel BuildRequires: kcompletion-devel @@ -45,16 +51,16 @@ BuildRequires: kxmlgui-devel BuildRequires: libexiv2-devel BuildRequires: libpodofo-devel -%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 BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(taglib) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%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 powerful batch renamer by KDE. It allows you to easily rename @@ -64,10 +70,9 @@ %prep %setup -q -%patch0 -p0 # GPLv2 only code, not really needed, lets avoid the license discussion rm -rf src/modeltest.* -%patch1 -p0 +%autopatch -p1 %build %cmake_kf5 -d build @@ -80,8 +85,8 @@ %find_lang %{name} %files -f %{name}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING README.md TODO +%license COPYING +%doc AUTHORS README.md TODO %if 0%{?suse_version} == 1315 && 0%{?sle_version} == 120100 %dir %{_kf5_appstreamdir} %endif ++++++ 0001-Use-cmakedefine01-instead-of-macro_bool_to_01.patch ++++++
From ec90823494f5ec9bb2e8098f44209f383ef8c22a Mon Sep 17 00:00:00 2001 From: Heiko Becker
Date: Tue, 20 Nov 2018 18:24:29 +0100 Subject: [PATCH 1/3] Use #cmakedefine01 instead of macro_bool_to_01
---
CMakeLists.txt | 13 +++++--------
cmake/modules/MacroBoolTo01.cmake | 20 --------------------
config-krename.h.cmake | 10 +++++-----
3 files changed, 10 insertions(+), 33 deletions(-)
delete mode 100644 cmake/modules/MacroBoolTo01.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc986fa..717d859 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,13 +80,10 @@ set_package_properties(Freetype PROPERTIES
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
-
-# Update configuration
-include(MacroBoolTo01)
-macro_bool_to_01(TAGLIB_FOUND HAVE_TAGLIB)
-macro_bool_to_01(EXIV2_FOUND HAVE_EXIV2)
-macro_bool_to_01(PoDoFo_FOUND HAVE_PODOFO)
-macro_bool_to_01(FREETYPE_FOUND HAVE_FREETYPE)
+set(HAVE_TAGLIB TAGLIB_FOUND)
+set(HAVE_EXIV2 EXIV2_FOUND)
+set(HAVE_PODOFO PoDoFo_FOUND)
+set(HAVE_FREETYPE FREETYPE_FOUND)
configure_file(config-krename.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krename.h)
# Directories
diff --git a/cmake/modules/MacroBoolTo01.cmake b/cmake/modules/MacroBoolTo01.cmake
deleted file mode 100644
index 63b9852..0000000
--- a/cmake/modules/MacroBoolTo01.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-# MACRO_BOOL_TO_01( VAR RESULT0 ... RESULTN )
-# This macro evaluates its first argument
-# and sets all the given vaiables either to 0 or 1
-# depending on the value of the first one
-
-# Copyright (c) 2006, Alexander Neundorf,
From b22de9135ba2a5abdbd2b275a60933a50f074010 Mon Sep 17 00:00:00 2001 From: Heiko Becker
Date: Tue, 20 Nov 2018 18:26:47 +0100 Subject: [PATCH 2/3] Fix building against exiv2-0.27
One neeeded part is to copy over the new FindLibExiv2 module from
ECM which has not appeared in a release yet (it will with 5.53.0).
I'll probably add that version as a requirement and remove the copy
again in the near future.
The other part includes raising the cmake version requirement to
3.7.0, which was released over 2 years ago. (The version comparison
could be easily solved differently and less elegantly, but let's see
if people with ancient cmakes complain).
---
CMakeLists.txt | 15 ++---
cmake/modules/FindExiv2.cmake | 79 ---------------------------
cmake/modules/FindLibExiv2.cmake | 115 +++++++++++++++++++++++++++++++++++++++
config-krename.h.cmake | 3 +
src/CMakeLists.txt | 8 +--
src/exiv2plugin.cpp | 8 ++-
6 files changed, 137 insertions(+), 91 deletions(-)
delete mode 100644 cmake/modules/FindExiv2.cmake
create mode 100644 cmake/modules/FindLibExiv2.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 717d859..be33a09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
project(krename)
-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.7)
# 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})
@@ -52,11 +52,12 @@ set_package_properties(Taglib PROPERTIES
TYPE OPTIONAL)
# Find exiv2
-find_package(Exiv2 0.13) # AccessMode was added in 0.13
-set_package_properties(Exiv2 PROPERTIES
- DESCRIPTION "A library to access image metadata"
- URL "http://www.exiv2.org"
- TYPE OPTIONAL)
+find_package(LibExiv2 0.13) # AccessMode was added in 0.13
+set_package_properties(LibExiv2 PROPERTIES TYPE OPTIONAL)
+
+if (LibExiv2_VERSION VERSION_GREATER_EQUAL "0.27")
+ set(HAVE_LIBEXIV2_0_27 TRUE)
+endif()
# Find podofo
find_package(PoDoFo)
@@ -81,7 +82,7 @@ set_package_properties(Freetype PROPERTIES
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
set(HAVE_TAGLIB TAGLIB_FOUND)
-set(HAVE_EXIV2 EXIV2_FOUND)
+set(HAVE_EXIV2 LibExiv2_FOUND)
set(HAVE_PODOFO PoDoFo_FOUND)
set(HAVE_FREETYPE FREETYPE_FOUND)
configure_file(config-krename.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krename.h)
diff --git a/cmake/modules/FindExiv2.cmake b/cmake/modules/FindExiv2.cmake
deleted file mode 100644
index dd9af86..0000000
--- a/cmake/modules/FindExiv2.cmake
+++ /dev/null
@@ -1,79 +0,0 @@
-# - Try to find the Exiv2 library
-#
-# EXIV2_MIN_VERSION - You can set this variable to the minimum version you need
-# before doing FIND_PACKAGE(Exiv2). The default is 0.12.
-#
-# Once done this will define
-#
-# EXIV2_FOUND - system has libexiv2
-# EXIV2_INCLUDE_DIR - the libexiv2 include directory
-# EXIV2_LIBRARIES - Link these to use libexiv2
-# EXIV2_DEFINITIONS - Compiler switches required for using libexiv2
-#
-# The minimum required version of Exiv2 can be specified using the
-# standard syntax, e.g. find_package(Exiv2 0.17)
-#
-# For compatibility, also the variable EXIV2_MIN_VERSION can be set to the minimum version
-# you need before doing FIND_PACKAGE(Exiv2). The default is 0.12.
-
-# Copyright (c) 2010, Alexander Neundorf,
From e54a32c89a8e2b9e01d4d02b699bac6062db0500 Mon Sep 17 00:00:00 2001 From: Heiko Becker
Date: Tue, 20 Nov 2018 19:01:04 +0100 Subject: [PATCH 3/3] Fix the previous commits and the build with exiv2<0.27
--- CMakeLists.txt | 10 +++++----- config-krename.h.cmake | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be33a09..4cbbb09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,10 +81,10 @@ set_package_properties(Freetype PROPERTIES feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) -set(HAVE_TAGLIB TAGLIB_FOUND) -set(HAVE_EXIV2 LibExiv2_FOUND) -set(HAVE_PODOFO PoDoFo_FOUND) -set(HAVE_FREETYPE FREETYPE_FOUND) +set(HAVE_TAGLIB ${TAGLIB_FOUND}) +set(HAVE_EXIV2 ${LibExiv2_FOUND}) +set(HAVE_PODOFO ${PoDoFo_FOUND}) +set(HAVE_FREETYPE ${FREETYPE_FOUND}) configure_file(config-krename.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krename.h) # Directories diff --git a/config-krename.h.cmake b/config-krename.h.cmake index de25e6f..76c3d30 100644 --- a/config-krename.h.cmake +++ b/config-krename.h.cmake @@ -7,7 +7,7 @@ #cmakedefine01 HAVE_EXIV2 /* Defined if we have libexiv2 >= 0.27 */ -#cmakedefine01 HAVE_LIBEXIV2_0_27 +#cmakedefine HAVE_LIBEXIV2_0_27 /* have PoDoFo */ #cmakedefine01 HAVE_PODOFO -- 2.16.4 ++++++ lower-minimum-cmake-version.patch ++++++
From 7a586c57c308107c3e63ae3cd199079de2bee8e6 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer
Date: Wed, 2 Jan 2019 10:54:42 +0100 Subject: [PATCH] Lower minimum cmake version
VERSION_GREATER_EQUAL is new in cmake 3.7. So use NOT VERSION_LESS instead, which also works with older versions. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4cbbb09..a6301c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ project(krename) -cmake_minimum_required(VERSION 3.7) +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}) @@ -61,7 +61,7 @@ set_package_properties(Taglib PROPERTIES find_package(LibExiv2 0.13) # AccessMode was added in 0.13 set_package_properties(LibExiv2 PROPERTIES TYPE OPTIONAL) -if (LibExiv2_VERSION VERSION_GREATER_EQUAL "0.27") +if (NOT LibExiv2_VERSION VERSION_LESS "0.27") set(HAVE_LIBEXIV2_0_27 TRUE) endif() -- 2.16.4 ++++++ remove-gplv2-code.diff ++++++ --- /var/tmp/diff_new_pack.z5MY8D/_old 2019-01-03 18:08:30.444040190 +0100 +++ /var/tmp/diff_new_pack.z5MY8D/_new 2019-01-03 18:08:30.448040186 +0100 @@ -1,5 +1,5 @@ ---- src/CMakeLists.txt -+++ src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt @@ -47,7 +47,6 @@ krenametest.cpp krenametokensorter.cpp @@ -8,8 +8,8 @@ numberdialog.cpp insertpartfilenamedlg.cpp threadedlister.cpp ---- src/krenameimpl.cpp -+++ src/krenameimpl.cpp +--- a/src/krenameimpl.cpp ++++ b/src/krenameimpl.cpp @@ -31,8 +31,6 @@ #include "threadedlister.h" #include "tokenhelpdialog.h" @@ -51,8 +51,8 @@ void KRenameImpl::slotUpdateCount() { m_window->setCount(m_vector.size()); ---- src/krenameimpl.h -+++ src/krenameimpl.h +--- a/src/krenameimpl.h ++++ b/src/krenameimpl.h @@ -100,11 +100,6 @@ */ void saveConfig(); ++++++ servicemenus-files.patch ++++++ --- /var/tmp/diff_new_pack.z5MY8D/_old 2019-01-03 18:08:30.456040179 +0100 +++ /var/tmp/diff_new_pack.z5MY8D/_new 2019-01-03 18:08:30.456040179 +0100 @@ -1,6 +1,6 @@ -diff -uNr src/servicemenus/krename_all_nonrec.desktop src/servicemenus_new/krename_all_nonrec.desktop ---- src/servicemenus/krename_all_nonrec.desktop 2009-09-05 19:13:29.000000000 +0300 -+++ src/servicemenus_new/krename_all_nonrec.desktop 2011-01-30 22:08:29.037391236 +0200 +diff -uNr a/src/servicemenus/krename_all_nonrec.desktop b/src/servicemenus_new/krename_all_nonrec.desktop +--- a/src/servicemenus/krename_all_nonrec.desktop 2009-09-05 19:13:29.000000000 +0300 ++++ b/src/servicemenus_new/krename_all_nonrec.desktop 2011-01-30 22:08:29.037391236 +0200 @@ -1,10 +1,10 @@ # Sending all kinds of file to Krename [Desktop Entry] @@ -16,9 +16,9 @@ [Desktop Action rename] Exec=krename %U Icon=krename -diff -uNr src/servicemenus/krename_dir_rec.desktop src/servicemenus_new/krename_dir_rec.desktop ---- src/servicemenus/krename_dir_rec.desktop 2009-09-05 19:13:29.000000000 +0300 -+++ src/servicemenus_new/krename_dir_rec.desktop 2011-01-30 22:08:41.257147523 +0200 +diff -uNr a/src/servicemenus/krename_dir_rec.desktop b/src/servicemenus_new/krename_dir_rec.desktop +--- a/src/servicemenus/krename_dir_rec.desktop 2009-09-05 19:13:29.000000000 +0300 ++++ b/src/servicemenus_new/krename_dir_rec.desktop 2011-01-30 22:08:41.257147523 +0200 @@ -1,10 +1,10 @@ # Sending all kinds of files recursively from a directory to Krename [Desktop Entry]