From 197921fe9cbcfc520069736123c89bb090e16c26 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 8 Jun 2018 13:35:16 -0500 Subject: [PATCH] cleanup, use %majmin --- .gitignore | 27 --------------------------- kf5-kxmlgui.spec | 47 +++++++++++++++++++++++++---------------------- 2 files changed, 25 insertions(+), 49 deletions(-) diff --git a/.gitignore b/.gitignore index 074c22b..00005d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1 @@ -/kxmlgui-5.18.0.tar.xz -/kxmlgui-5.19.0.tar.xz -/kxmlgui-5.20.0.tar.xz -/kxmlgui-5.21.0.tar.xz -/kxmlgui-5.22.0.tar.xz -/kxmlgui-5.23.0.tar.xz -/kxmlgui-5.24.0.tar.xz -/kxmlgui-5.25.0.tar.xz -/kxmlgui-5.26.0.tar.xz -/kxmlgui-5.27.0.tar.xz -/kxmlgui-5.29.0.tar.xz -/kxmlgui-5.31.0.tar.xz -/kxmlgui-5.32.0.tar.xz -/kxmlgui-5.33.0.tar.xz -/kxmlgui-5.34.0.tar.xz -/kxmlgui-5.35.0.tar.xz -/kxmlgui-5.36.0.tar.xz -/kxmlgui-5.37.0.tar.xz -/kxmlgui-5.38.0.tar.xz -/kxmlgui-5.39.0.tar.xz -/kxmlgui-5.40.0.tar.xz -/kxmlgui-5.41.0.tar.xz -/kxmlgui-5.42.0.tar.xz -/kxmlgui-5.43.0.tar.xz -/kxmlgui-5.44.0.tar.xz -/kxmlgui-5.45.0.tar.xz -/kxmlgui-5.46.0.tar.xz /kxmlgui-5.47.0.tar.xz diff --git a/kf5-kxmlgui.spec b/kf5-kxmlgui.spec index 0e6f6e7..07bf061 100644 --- a/kf5-kxmlgui.spec +++ b/kf5-kxmlgui.spec @@ -1,15 +1,15 @@ %global framework kxmlgui -Name: kf5-%{framework} +Name: kf5-%{framework} Version: 5.47.0 -Release: 1%{?dist} -Summary: KDE Frameworks 5 Tier 3 solution for user-configurable main windows +Release: 2%{?dist} +Summary: KDE Frameworks 5 Tier 3 solution for user-configurable main windows # Library LGPLv2+, ksendbugmail is GPLv2+ -License: GPLv2+ and LGPLv2+ -URL: https://cgit.kde.org/%{framework}.git +License: GPLv2+ and 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 @@ -18,20 +18,20 @@ URL: https://cgit.kde.org/%{framework}.git %endif Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz -BuildRequires: extra-cmake-modules >= %{version} -BuildRequires: kf5-attica-devel >= %{version} -BuildRequires: kf5-kconfig-devel >= %{version} -BuildRequires: kf5-kconfig-devel >= %{version} -BuildRequires: kf5-kconfigwidgets-devel >= %{version} -BuildRequires: kf5-kcoreaddons-devel >= %{version} -BuildRequires: kf5-kglobalaccel-devel >= %{version} -BuildRequires: kf5-ki18n-devel >= %{version} -BuildRequires: kf5-kiconthemes-devel >= %{version} -BuildRequires: kf5-kitemviews-devel >= %{version} -BuildRequires: kf5-ktextwidgets-devel >= %{version} -BuildRequires: kf5-kwidgetsaddons-devel >= %{version} -BuildRequires: kf5-kwindowsystem-devel >= %{version} -BuildRequires: kf5-rpm-macros >= %{version} +BuildRequires: extra-cmake-modules >= %{majmin} +BuildRequires: kf5-attica-devel >= %{majmin} +BuildRequires: kf5-kconfig-devel >= %{majmin} +BuildRequires: kf5-kconfig-devel >= %{majmin} +BuildRequires: kf5-kconfigwidgets-devel >= %{majmin} +BuildRequires: kf5-kcoreaddons-devel >= %{majmin} +BuildRequires: kf5-kglobalaccel-devel >= %{majmin} +BuildRequires: kf5-ki18n-devel >= %{majmin} +BuildRequires: kf5-kiconthemes-devel >= %{majmin} +BuildRequires: kf5-kitemviews-devel >= %{majmin} +BuildRequires: kf5-ktextwidgets-devel >= %{majmin} +BuildRequires: kf5-kwidgetsaddons-devel >= %{majmin} +BuildRequires: kf5-kwindowsystem-devel >= %{majmin} +BuildRequires: kf5-rpm-macros BuildRequires: libX11-devel BuildRequires: qt5-qtbase-devel @@ -44,8 +44,8 @@ KDE Frameworks 5 Tier 3 solution for user-configurable main windows. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: kf5-kconfig-devel >= %{version} -Requires: kf5-kconfigwidgets-devel >= %{version} +Requires: kf5-kconfig-devel >= %{majmin} +Requires: kf5-kconfigwidgets-devel >= %{majmin} Requires: qt5-qtbase-devel %description devel The %{name}-devel package contains libraries and header files for @@ -94,6 +94,9 @@ mkdir -p %{buildroot}%{_kf5_datadir}/kxmlgui5/ %changelog +* Fri Jun 08 2018 Rex Dieter - 5.47.0-2 +- cleanup, use %%majmin + * Sat Jun 02 2018 Rex Dieter - 5.47.0-1 - 5.47.0