From 1e6ac25965cd05cde70533f77ed2129fb78e75511e9a37af1f991e8b4c08ae20 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 12 Jul 2017 05:32:35 +0000 Subject: [PATCH] KDE Frameworks 5.36.0 checkin OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kfilemetadata5?expand=0&rev=143 --- ffmpeg-buildrequires.patch | 11 ++++++----- kfilemetadata-5.35.0.tar.xz | 3 --- kfilemetadata-5.36.0.tar.xz | 3 +++ kfilemetadata5.changes | 13 +++++++++++++ kfilemetadata5.spec | 4 ++-- 5 files changed, 24 insertions(+), 10 deletions(-) delete mode 100644 kfilemetadata-5.35.0.tar.xz create mode 100644 kfilemetadata-5.36.0.tar.xz diff --git a/ffmpeg-buildrequires.patch b/ffmpeg-buildrequires.patch index 624537f..20bcf52 100644 --- a/ffmpeg-buildrequires.patch +++ b/ffmpeg-buildrequires.patch @@ -1,6 +1,7 @@ -diff -urNB kfilemetadata/cmake/FindFFmpeg.cmake new/cmake/FindFFmpeg.cmake ---- kfilemetadata/cmake/FindFFmpeg.cmake 2016-11-21 20:58:44.371788460 +0100 -+++ new/cmake/FindFFmpeg.cmake 2016-11-21 20:59:09.591943836 +0100 +Index: kfilemetadata-5.36.0/cmake/FindFFmpeg.cmake +=================================================================== +--- kfilemetadata-5.36.0.orig/cmake/FindFFmpeg.cmake ++++ kfilemetadata-5.36.0/cmake/FindFFmpeg.cmake @@ -9,11 +9,8 @@ # # For each of the components it will additionally set. @@ -13,7 +14,7 @@ diff -urNB kfilemetadata/cmake/FindFFmpeg.cmake new/cmake/FindFFmpeg.cmake # the following variables will be defined # _FOUND - System has # _INCLUDE_DIRS - Include directory necessary for using the headers -@@ -121,10 +118,7 @@ +@@ -121,10 +118,7 @@ if (NOT FFMPEG_LIBRARIES) # Check for all possible component. find_component(AVCODEC libavcodec avcodec libavcodec/avcodec.h) find_component(AVFORMAT libavformat avformat libavformat/avformat.h) @@ -24,7 +25,7 @@ diff -urNB kfilemetadata/cmake/FindFFmpeg.cmake new/cmake/FindFFmpeg.cmake # Check if the required components were found and add their stuff to the FFMPEG_* vars. foreach (_component ${FFmpeg_FIND_COMPONENTS}) -@@ -155,7 +149,7 @@ +@@ -155,7 +149,7 @@ if (NOT FFMPEG_LIBRARIES) endif () # Now set the noncached _FOUND vars for the components. diff --git a/kfilemetadata-5.35.0.tar.xz b/kfilemetadata-5.35.0.tar.xz deleted file mode 100644 index bbc5892..0000000 --- a/kfilemetadata-5.35.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8e7c0e93469edd66bcc45db90c6116fd342796cbd70492eb3eac836d20b06a2a -size 218124 diff --git a/kfilemetadata-5.36.0.tar.xz b/kfilemetadata-5.36.0.tar.xz new file mode 100644 index 0000000..17ea047 --- /dev/null +++ b/kfilemetadata-5.36.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:750c1f408bad265ee10bfcd60eab88988d8bb6b3b38fd59ebad1899c683b269d +size 218296 diff --git a/kfilemetadata5.changes b/kfilemetadata5.changes index d793917..cdb7c14 100644 --- a/kfilemetadata5.changes +++ b/kfilemetadata5.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Jul 12 07:14:00 CEST 2017 - lbeltrame@kde.org + +- Update to 5.36.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.36.0.php +- Changes since 5.35.0: + * Fix configure with Qt5Multimedia disabled. + * add an extractor using qtmultimedia + * [FEATURE] Option to build & install QCH file with the public API dox + * fix warnings from clazy with the default warning level + ------------------------------------------------------------------- Sun Jun 11 09:27:43 CEST 2017 - lbeltrame@kde.org diff --git a/kfilemetadata5.spec b/kfilemetadata5.spec index fe0e62a..0127251 100644 --- a/kfilemetadata5.spec +++ b/kfilemetadata5.spec @@ -18,9 +18,9 @@ %bcond_without ffmpeg %bcond_without lang -%define _tar_path 5.35 +%define _tar_path 5.36 Name: kfilemetadata5 -Version: 5.35.0 +Version: 5.36.0 Release: 0 %define kf5_version %{version} Summary: Extract Metadata