From 28fb394a21dec97be977198c72e281c8706c3a0924947cab50ca212a8223f49e Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Thu, 27 Apr 2017 20:24:03 +0000 Subject: [PATCH] Revert to using _tar_path to fix Factory submission OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=143 --- frameworkintegration.spec | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/frameworkintegration.spec b/frameworkintegration.spec index 8df8e31..1bacd3f 100644 --- a/frameworkintegration.spec +++ b/frameworkintegration.spec @@ -17,26 +17,23 @@ %define lname libKF5Style5 +%define _tar_path 5.33 Name: frameworkintegration 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: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes -BuildRequires: kconfig-devel >= %{_kf5_bugfix_version} -BuildRequires: kconfigwidgets-devel >= %{_kf5_bugfix_version} +BuildRequires: kconfig-devel >= %{_tar_path} +BuildRequires: kconfigwidgets-devel >= %{_tar_path} BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel >= %{_kf5_bugfix_version} -BuildRequires: kiconthemes-devel >= %{_kf5_bugfix_version} -BuildRequires: kio-devel >= %{_kf5_bugfix_version} -BuildRequires: knotifications-devel >= %{_kf5_bugfix_version} -BuildRequires: kpackage-devel >= %{_kf5_bugfix_version} -BuildRequires: kwidgetsaddons-devel >= %{_kf5_bugfix_version} +BuildRequires: ki18n-devel >= %{_tar_path} +BuildRequires: kiconthemes-devel >= %{_tar_path} +BuildRequires: kio-devel >= %{_tar_path} +BuildRequires: knotifications-devel >= %{_tar_path} +BuildRequires: kpackage-devel >= %{_tar_path} +BuildRequires: kwidgetsaddons-devel >= %{_tar_path} %if 0%{?suse_version} >= 1330 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) BuildRequires: cmake(AppStreamQt) >= 0.10.4 %endif @@ -52,7 +49,7 @@ Summary: Plugins responsible for better integration of Qt applications in 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 Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -94,8 +91,8 @@ Summary: Plugins responsible for better integration of Qt applications in Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules -Requires: kconfigwidgets-devel >= %{_kf5_bugfix_version} -Requires: kiconthemes-devel >= %{_kf5_bugfix_version} +Requires: kconfigwidgets-devel >= %{_tar_path} +Requires: kiconthemes-devel >= %{_tar_path} %description devel Framework Integration is a set of plugins responsible for better