From bfbcc580c7ccaec8f8c33243803febeaa46a71ded5645c14d3d1e2aeb12f2cd5 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Thu, 27 Apr 2017 20:24:39 +0000
Subject: [PATCH] Revert to using _tar_path to fix Factory submission

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdeclarative?expand=0&rev=132
---
 kdeclarative.spec | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/kdeclarative.spec b/kdeclarative.spec
index de32320..a2b278c 100644
--- a/kdeclarative.spec
+++ b/kdeclarative.spec
@@ -18,28 +18,25 @@
 
 %bcond_without lang
 %define lname   libKF5Declarative5
+%define _tar_path 5.33
 Name:           kdeclarative
 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:  kcoreaddons-devel >= %{_kf5_bugfix_version}
+BuildRequires:  kconfig-devel >= %{_tar_path}
+BuildRequires:  kcoreaddons-devel >= %{_tar_path}
 BuildRequires:  kf5-filesystem
-BuildRequires:  kglobalaccel-devel >= %{_kf5_bugfix_version}
-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:  kpackage-devel >= %{_kf5_bugfix_version}
-BuildRequires:  kwidgetsaddons-devel >= %{_kf5_bugfix_version}
-BuildRequires:  kwindowsystem-devel >= %{_kf5_bugfix_version}
+BuildRequires:  kglobalaccel-devel >= %{_tar_path}
+BuildRequires:  kguiaddons-devel >= %{_tar_path}
+BuildRequires:  ki18n-devel >= %{_tar_path}
+BuildRequires:  kiconthemes-devel >= %{_tar_path}
+BuildRequires:  kio-devel >= %{_tar_path}
+BuildRequires:  kpackage-devel >= %{_tar_path}
+BuildRequires:  kwidgetsaddons-devel >= %{_tar_path}
+BuildRequires:  kwindowsystem-devel >= %{_tar_path}
 BuildRequires:  libepoxy-devel
 BuildRequires:  cmake(Qt5Core) >= 5.6.0
 BuildRequires:  cmake(Qt5Gui) >= 5.6.0
@@ -50,7 +47,7 @@ Summary:        Integration of QML and KDE workspaces
 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
 
@@ -104,9 +101,9 @@ Group:          Development/Libraries/KDE
 Requires:       %lname = %{version}
 Requires:       %{name}-components = %{version}
 Requires:       extra-cmake-modules
-Requires:       kconfig-devel >= %{_kf5_bugfix_version}
-Requires:       kcoreaddons-devel >= %{_kf5_bugfix_version}
-Requires:       kpackage-devel >= %{_kf5_bugfix_version}
+Requires:       kconfig-devel >= %{_tar_path}
+Requires:       kcoreaddons-devel >= %{_tar_path}
+Requires:       kpackage-devel >= %{_tar_path}
 Requires:       libKF5CalendarEvents5 = %{version}
 Requires:       libKF5QuickAddons5 = %{version}
 Requires:       cmake(Qt5Qml) >= 5.6.0