From 08d48bdafc9616d664d737986fc0f98198fd9c27691fdc4bd1e58962b152dab3 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Thu, 27 Apr 2017 20:24:08 +0000 Subject: [PATCH] Revert to using _tar_path to fix Factory submission OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=145 --- kactivities5.spec | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/kactivities5.spec b/kactivities5.spec index 36d0072..5d8d00b 100644 --- a/kactivities5.spec +++ b/kactivities5.spec @@ -17,19 +17,16 @@ %define lname libKF5Activities5 +%define _tar_path 5.33 Name: kactivities5 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: KDE Plasma Activities support License: GPL-2.0+ Group: System/GUI/KDE Url: http://projects.kde.org/kactivities -Source: http://download.kde.org/stable/frameworks/%{_kf5_bugfix_version}/kactivities-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_tar_path}/kactivities-%{version}.tar.xz Source1: baselibs.conf %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel @@ -37,14 +34,14 @@ BuildRequires: libboost_headers-devel BuildRequires: boost-devel %endif BuildRequires: cmake >= 3.0 -BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} +BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: xz -BuildRequires: cmake(KF5Config) >= %{_kf5_bugfix_version} -BuildRequires: cmake(KF5CoreAddons) >= %{_kf5_bugfix_version} -BuildRequires: cmake(KF5KIO) >= %{_kf5_bugfix_version} -BuildRequires: cmake(KF5WindowSystem) >= %{_kf5_bugfix_version} +BuildRequires: cmake(KF5Config) >= %{_tar_path} +BuildRequires: cmake(KF5CoreAddons) >= %{_tar_path} +BuildRequires: cmake(KF5KIO) >= %{_tar_path} +BuildRequires: cmake(KF5WindowSystem) >= %{_tar_path} BuildRequires: cmake(Qt5Core) >= 5.6.0 BuildRequires: cmake(Qt5DBus) >= 5.6.0 BuildRequires: cmake(Qt5Gui) >= 5.6.0