From 3d758241294758f58c10d7b4baff734f8772b3b8d054c541dec57b7463326927 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Thu, 27 Apr 2017 20:25:01 +0000 Subject: [PATCH] Revert to using _tar_path to fix Factory submission OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kfilemetadata5?expand=0&rev=137 --- kfilemetadata5.spec | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/kfilemetadata5.spec b/kfilemetadata5.spec index 49d05de..83ea5cb 100644 --- a/kfilemetadata5.spec +++ b/kfilemetadata5.spec @@ -18,30 +18,27 @@ %bcond_without ffmpeg %bcond_without lang +%define _tar_path 5.33 Name: kfilemetadata5 Version: 5.33.0 Release: 0 -# Full KF5 version (e.g. 5.33.0) -%{!?_kf5_version: %global _kf5_version %{version}} -# Last major and minor KF5 version (e.g. 5.33) -%{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %define kf5_version %{version} Summary: Extract Metadata License: GPL-2.0+ and LGPL-2.1+ and LGPL-3.0 Group: Development/Libraries/KDE Url: http://www.kde.org/ -Source: http://download.kde.org/stable/frameworks/%{_kf5_bugfix_version}/kfilemetadata-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_tar_path}/kfilemetadata-%{version}.tar.xz Source1: baselibs.conf Patch0: ffmpeg-buildrequires.patch -BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} +BuildRequires: extra-cmake-modules >= %{_tar_path} %if %{with ffmpeg} BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) %endif -BuildRequires: karchive-devel >= %{_kf5_bugfix_version} +BuildRequires: karchive-devel >= %{_tar_path} BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel >= %{_kf5_bugfix_version} +BuildRequires: ki18n-devel >= %{_tar_path} BuildRequires: libattr-devel BuildRequires: libepub-devel BuildRequires: libexiv2-devel >= 0.21 @@ -62,7 +59,7 @@ A library for extracting file metadata. Summary: Development package for kfilemetadata Group: Development/Libraries/KDE Requires: %{name} = %{version} -Requires: extra-cmake-modules >= %{_kf5_bugfix_version} +Requires: extra-cmake-modules >= %{_tar_path} Requires: cmake(Qt5Core) >= 5.6.0 %description devel