1
0

Accepting request 674333 from KDE:Frameworks5

OBS-URL: https://build.opensuse.org/request/show/674333
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kfilemetadata5?expand=0&rev=68
This commit is contained in:
Dominique Leuenberger 2019-02-14 13:30:07 +00:00 committed by Git OBS Bridge
commit 26913e677b
5 changed files with 59 additions and 5 deletions

View File

@ -0,0 +1,29 @@
From 1632a6972279d150aeb8de9e1cf0000ba1c3c380 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Tue, 12 Feb 2019 10:31:01 +0100
Subject: Fix build with cmake 3.5
VERSION_GREATER_EQUAL requires cmake 3.7 or higher.
So use NOT VERSION_LESS instead, which is logically equivalent and also
works with older cmake versions.
Differential Revision: https://phabricator.kde.org/D18941
---
src/extractors/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/extractors/CMakeLists.txt b/src/extractors/CMakeLists.txt
index 8795b48..6b4859c 100644
--- a/src/extractors/CMakeLists.txt
+++ b/src/extractors/CMakeLists.txt
@@ -36,7 +36,7 @@ if(LibExiv2_FOUND)
KF5::FileMetaData
LibExiv2::LibExiv2
)
- if(${LibExiv2_VERSION} VERSION_GREATER_EQUAL 0.26)
+ if(NOT ${LibExiv2_VERSION} VERSION_LESS 0.26)
target_compile_definitions(kfilemetadata_exiv2extractor PRIVATE "-DHAVE_WEBP_SUPPORT")
endif()
--
cgit v1.1

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4b6de53b791ad8cf19d5aa331555e3863f22e54adf6149668125635b820f86c2
size 302204

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b1a62f1d62ad0e45f523cbf96b872d3617a65c193483f7a5cbc6b8e48c11123b
size 302672

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Tue Feb 12 07:03:30 UTC 2019 - wbauer@tmo.at
- Add fix-build-with-cmake-3.5.patch to fix build with cmake 3.5.2
on Leap 42.3
-------------------------------------------------------------------
Sun Feb 10 22:03:07 UTC 2019 - lbeltrame@kde.org
- Update to 5.55.0
* New feature release
* For more details please see:
* https://www.kde.org/announcements/kde-frameworks-5.55.0.php
- Changes since 5.54.0:
* harmonize testing data
* exiv2extractor: add support for bmp, gif, webp, tga
* Fix failing test of exiv gps data
* Test empty and zero gps data
* Remove explicit use of ECM_KDE_MODULE_DIR, is part of ECM_MODULE_PATH
* Use more https in links
* add support for more mimetypes to taglibwriter
-------------------------------------------------------------------
Mon Jan 14 06:08:46 UTC 2019 - lbeltrame@kde.org

View File

@ -16,7 +16,7 @@
#
%define _tar_path 5.54
%define _tar_path 5.55
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@ -24,7 +24,7 @@
%bcond_without ffmpeg
%bcond_without lang
Name: kfilemetadata5
Version: 5.54.0
Version: 5.55.0
Release: 0
Summary: Library for extracting Metadata
License: GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-only
@ -32,6 +32,8 @@ Group: Development/Libraries/KDE
URL: https://www.kde.org
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/kfilemetadata-%{version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM
Patch0: fix-build-with-cmake-3.5.patch
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: karchive-devel >= %{_kf5_bugfix_version}
BuildRequires: kf5-filesystem
@ -69,6 +71,7 @@ A library for extracting file metadata. Development files
%prep
%setup -q -n kfilemetadata-%{version}
%autopatch -p1
%build
%cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}