From d9a8529beb2d8c3f4193811d459f53ecad24ac00 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 16 May 2019 12:34:54 -0500 Subject: [PATCH] fix versionging (ie, use majmin) --- kf5-frameworkintegration.spec | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/kf5-frameworkintegration.spec b/kf5-frameworkintegration.spec index 37d5260..e9d498a 100644 --- a/kf5-frameworkintegration.spec +++ b/kf5-frameworkintegration.spec @@ -7,31 +7,31 @@ Summary: KDE Frameworks 5 Tier 4 workspace and cross-framework integration plugi License: LGPLv2+ URL: https://cgit.kde.org/%{framework}.git -%global versiondir %(echo %{version} | cut -d. -f1-2) +%global majmin %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 %global stable unstable %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz ## upstream patches (lookaside cache) # filter plugin provides %global __provides_exclude_from ^(%{_kf5_plugindir}/.*\\.so)$ -BuildRequires: extra-cmake-modules >= %{version} -BuildRequires: kf5-kconfig-devel >= %{version} -BuildRequires: kf5-kconfigwidgets-devel >= %{version} -BuildRequires: kf5-ki18n-devel >= %{version} -BuildRequires: kf5-kiconthemes-devel >= %{version} -BuildRequires: kf5-kio-devel >= %{version} -BuildRequires: kf5-knewstuff-devel >= %{version} -BuildRequires: kf5-knotifications-devel >= %{version} -BuildRequires: kf5-kpackage-devel >= %{version} -BuildRequires: kf5-kwidgetsaddons-devel >= %{version} -BuildRequires: kf5-rpm-macros >= %{version} +BuildRequires: extra-cmake-modules >= %{majmin} +BuildRequires: kf5-kconfig-devel >= %{majmin} +BuildRequires: kf5-kconfigwidgets-devel >= %{majmin} +BuildRequires: kf5-ki18n-devel >= %{majmin} +BuildRequires: kf5-kiconthemes-devel >= %{majmin} +BuildRequires: kf5-kio-devel >= %{majmin} +BuildRequires: kf5-knewstuff-devel >= %{majmin} +BuildRequires: kf5-knotifications-devel >= %{majmin} +BuildRequires: kf5-kpackage-devel >= %{majmin} +BuildRequires: kf5-kwidgetsaddons-devel >= %{majmin} +BuildRequires: kf5-rpm-macros >= %{majmin} BuildRequires: libXcursor-devel BuildRequires: qt5-qtbase-devel @@ -65,8 +65,8 @@ Requires: %{name} = %{version}-%{release} %package devel Summary: Development files for %{name} Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: kf5-kiconthemes-devel >= %{version} -Requires: kf5-kconfigwidgets-devel >= %{version} +Requires: kf5-kiconthemes-devel >= %{majmin} +Requires: kf5-kconfigwidgets-devel >= %{majmin} %description devel The %{name}-devel package contains libraries and header files for