From 19f30a79a544c0ff2db45820b0a01f393de62765822340ed93ad3b03b0c7995d Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 25 Jul 2016 20:59:46 +0000 Subject: [PATCH] Accepting request 415065 from home:olh:branches:KDE:Frameworks5 - Build with ffmpeg unconditional OBS-URL: https://build.opensuse.org/request/show/415065 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kfilemetadata5?expand=0&rev=109 --- kfilemetadata5.changes | 5 +++++ kfilemetadata5.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/kfilemetadata5.changes b/kfilemetadata5.changes index a054994..61c8d7d 100644 --- a/kfilemetadata5.changes +++ b/kfilemetadata5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 25 11:28:39 UTC 2016 - olaf@aepfle.de + +- Build with ffmpeg unconditional + ------------------------------------------------------------------- Wed Jul 6 15:03:41 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/kfilemetadata5.spec b/kfilemetadata5.spec index 4fce397..f2d0453 100644 --- a/kfilemetadata5.spec +++ b/kfilemetadata5.spec @@ -16,6 +16,7 @@ # +%bcond_without ffmpeg %bcond_without lang %define _tar_path 5.24 Name: kfilemetadata5 @@ -30,7 +31,7 @@ Source: http://download.kde.org/stable/frameworks/%{_tar_path}/kfilemeta Source1: baselibs.conf Patch0: ffmpeg-buildrequires.patch BuildRequires: extra-cmake-modules >= %{_tar_path} -%if 0%{?suse_version} > 1314 && "%{suse_version}" != "1320" +%if %{with ffmpeg} BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil)