From ed2024a8ebf3272510cae9131428ec86c5621ff7731a50d3561d614da4e104f6 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 17 Apr 2017 16:14:24 +0000 Subject: [PATCH] Put _kf5_bugfix_version to ease maintenance instead of relying on _tar_path (port from KUF) OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinit?expand=0&rev=130 --- kinit.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/kinit.spec b/kinit.spec index 7c2c3fb..3b5f822 100644 --- a/kinit.spec +++ b/kinit.spec @@ -17,21 +17,24 @@ %bcond_without lang -%define _tar_path 5.33 Name: kinit 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} BuildRequires: cmake >= 3.0 -BuildRequires: extra-cmake-modules >= %{_tar_path} +BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes -BuildRequires: kcrash-devel >= %{_tar_path} -BuildRequires: kdoctools-devel >= %{_tar_path} +BuildRequires: kcrash-devel >= %{_kf5_bugfix_version} +BuildRequires: kdoctools-devel >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel >= %{_tar_path} -BuildRequires: kio-devel >= %{_tar_path} -BuildRequires: kservice-devel >= %{_tar_path} -BuildRequires: kwindowsystem-devel >= %{_tar_path} +BuildRequires: ki18n-devel >= %{_kf5_bugfix_version} +BuildRequires: kio-devel >= %{_kf5_bugfix_version} +BuildRequires: kservice-devel >= %{_kf5_bugfix_version} +BuildRequires: kwindowsystem-devel >= %{_kf5_bugfix_version} BuildRequires: libcap-devel BuildRequires: libcap-progs BuildRequires: cmake(Qt5Core) >= 5.6.0 @@ -47,7 +50,7 @@ Summary: Helper library to speed up start of applications on KDE workspac License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_kf5_bugfix_version}/%{name}-%{version}.tar.xz Source1: baselibs.conf # PATCH-FIX-OPENSUSE fpie.patch -- add -(f)pie link flags to start_kdeinit target Patch0: fpie.patch