From 44bb26954f5acf371730eb30c1692d6fef84a6b041077da1c9f815aa48160a5f Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Thu, 27 Apr 2017 20:24:46 +0000 Subject: [PATCH] Revert to using _tar_path to fix Factory submission OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdesignerplugin?expand=0&rev=118 --- kdesignerplugin.spec | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/kdesignerplugin.spec b/kdesignerplugin.spec index 1dcf5da..820c8b2 100644 --- a/kdesignerplugin.spec +++ b/kdesignerplugin.spec @@ -17,34 +17,31 @@ %bcond_without lang +%define _tar_path 5.33 Name: kdesignerplugin 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 >= %{_kf5_bugfix_version} -BuildRequires: kbookmarks-devel >= %{_kf5_bugfix_version} -BuildRequires: kcompletion-devel >= %{_kf5_bugfix_version} -BuildRequires: kconfigwidgets-devel >= %{_kf5_bugfix_version} -BuildRequires: kdbusaddons-devel >= %{_kf5_bugfix_version} -BuildRequires: kdewebkit-devel >= %{_kf5_bugfix_version} -BuildRequires: kdoctools-devel >= %{_kf5_bugfix_version} +BuildRequires: extra-cmake-modules >= %{_tar_path} +BuildRequires: kbookmarks-devel >= %{_tar_path} +BuildRequires: kcompletion-devel >= %{_tar_path} +BuildRequires: kconfigwidgets-devel >= %{_tar_path} +BuildRequires: kdbusaddons-devel >= %{_tar_path} +BuildRequires: kdewebkit-devel >= %{_tar_path} +BuildRequires: kdoctools-devel >= %{_tar_path} BuildRequires: kf5-filesystem -BuildRequires: kguiaddons-devel >= %{_kf5_bugfix_version} -BuildRequires: ki18n-devel >= %{_kf5_bugfix_version} -BuildRequires: kiconthemes-devel >= %{_kf5_bugfix_version} -BuildRequires: kio-devel >= %{_kf5_bugfix_version} -BuildRequires: kitemviews-devel >= %{_kf5_bugfix_version} -BuildRequires: kplotting-devel >= %{_kf5_bugfix_version} -BuildRequires: kservice-devel >= %{_kf5_bugfix_version} -BuildRequires: ktextwidgets-devel >= %{_kf5_bugfix_version} -BuildRequires: kwidgetsaddons-devel >= %{_kf5_bugfix_version} -BuildRequires: kwindowsystem-devel >= %{_kf5_bugfix_version} -BuildRequires: kxmlgui-devel >= %{_kf5_bugfix_version} +BuildRequires: kguiaddons-devel >= %{_tar_path} +BuildRequires: ki18n-devel >= %{_tar_path} +BuildRequires: kiconthemes-devel >= %{_tar_path} +BuildRequires: kio-devel >= %{_tar_path} +BuildRequires: kitemviews-devel >= %{_tar_path} +BuildRequires: kplotting-devel >= %{_tar_path} +BuildRequires: kservice-devel >= %{_tar_path} +BuildRequires: ktextwidgets-devel >= %{_tar_path} +BuildRequires: kwidgetsaddons-devel >= %{_tar_path} +BuildRequires: kwindowsystem-devel >= %{_tar_path} +BuildRequires: kxmlgui-devel >= %{_tar_path} %if %{with lang} BuildRequires: cmake(Qt5LinguistTools) >= 5.6.0 %endif @@ -57,7 +54,7 @@ Summary: Integrating KDE frameworks widgets with Qt Designer License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/%{_kf5_bugfix_version}/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description