From 9989337ac2fe741a1beab31076ef7cd5b405f59d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jun 07 2018 21:51:44 +0000 Subject: cleanup, use %majmin --- diff --git a/.gitignore b/.gitignore index 964020d..795ce12 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1 @@ -/kdesignerplugin-5.18.0.tar.xz -/kdesignerplugin-5.19.0.tar.xz -/kdesignerplugin-5.20.0.tar.xz -/kdesignerplugin-5.21.0.tar.xz -/kdesignerplugin-5.22.0.tar.xz -/kdesignerplugin-5.23.0.tar.xz -/kdesignerplugin-5.24.0.tar.xz -/kdesignerplugin-5.25.0.tar.xz -/kdesignerplugin-5.26.0.tar.xz -/kdesignerplugin-5.27.0.tar.xz -/kdesignerplugin-5.29.0.tar.xz -/kdesignerplugin-5.31.0.tar.xz -/kdesignerplugin-5.32.0.tar.xz -/kdesignerplugin-5.33.0.tar.xz -/kdesignerplugin-5.34.0.tar.xz -/kdesignerplugin-5.35.0.tar.xz -/kdesignerplugin-5.36.0.tar.xz -/kdesignerplugin-5.37.0.tar.xz -/kdesignerplugin-5.38.0.tar.xz -/kdesignerplugin-5.39.0.tar.xz -/kdesignerplugin-5.40.0.tar.xz -/kdesignerplugin-5.41.0.tar.xz -/kdesignerplugin-5.42.0.tar.xz -/kdesignerplugin-5.43.0.tar.xz -/kdesignerplugin-5.44.0.tar.xz -/kdesignerplugin-5.45.0.tar.xz -/kdesignerplugin-5.46.0.tar.xz /kdesignerplugin-5.47.0.tar.xz diff --git a/kf5-kdesignerplugin.spec b/kf5-kdesignerplugin.spec index 3c8b294..dcaed1c 100644 --- a/kf5-kdesignerplugin.spec +++ b/kf5-kdesignerplugin.spec @@ -3,48 +3,48 @@ # uncomment to enable bootstrap mode #global bootstrap 1 -Name: kf5-%{framework} +Name: kf5-%{framework} Version: 5.47.0 -Release: 1%{?dist} -Summary: KDE Frameworks 5 Tier 3 integration module for Qt Designer +Release: 2%{?dist} +Summary: KDE Frameworks 5 Tier 3 integration module for Qt Designer -License: LGPLv2+ -URL: https://cgit.kde.org/%{framework}.git +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 -BuildRequires: extra-cmake-modules >= %{version} -BuildRequires: kf5-kconfig-devel >= %{version} -BuildRequires: kf5-kcoreaddons-devel >= %{version} -BuildRequires: kf5-kdoctools-devel >= %{version} -BuildRequires: kf5-rpm-macros >= %{version} +BuildRequires: extra-cmake-modules >= %{majmin} +BuildRequires: kf5-kconfig-devel >= %{majmin} +BuildRequires: kf5-kcoreaddons-devel >= %{majmin} +BuildRequires: kf5-kdoctools-devel >= %{majmin} +BuildRequires: kf5-rpm-macros BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtdeclarative-devel BuildRequires: qt5-qttools-devel BuildRequires: qt5-qttools-static # optional requirements -BuildRequires: kf5-kcompletion-devel >= %{version} -BuildRequires: kf5-kconfigwidgets-devel >= %{version} -BuildRequires: kf5-kiconthemes-devel >= %{version} -BuildRequires: kf5-kio-devel >= %{version} -BuildRequires: kf5-kitemviews-devel >= %{version} -BuildRequires: kf5-kplotting-devel >= %{version} -BuildRequires: kf5-ktextwidgets-devel >= %{version} -BuildRequires: kf5-kwidgetsaddons-devel >= %{version} -BuildRequires: kf5-kxmlgui-devel >= %{version} -BuildRequires: kf5-sonnet-devel >= %{version} +BuildRequires: kf5-kcompletion-devel >= %{majmin} +BuildRequires: kf5-kconfigwidgets-devel >= %{majmin} +BuildRequires: kf5-kiconthemes-devel >= %{majmin} +BuildRequires: kf5-kio-devel >= %{majmin} +BuildRequires: kf5-kitemviews-devel >= %{majmin} +BuildRequires: kf5-kplotting-devel >= %{majmin} +BuildRequires: kf5-ktextwidgets-devel >= %{majmin} +BuildRequires: kf5-kwidgetsaddons-devel >= %{majmin} +BuildRequires: kf5-kxmlgui-devel >= %{majmin} +BuildRequires: kf5-sonnet-devel >= %{majmin} %if ! 0%{?bootstrap} BuildRequires: qt5-qtwebkit-devel -BuildRequires: kf5-kdewebkit-devel >= %{version} +BuildRequires: kf5-kdewebkit-devel >= %{majmin} %endif Obsoletes: kf5-kdesignerplugin-devel < 5.18.0-2 @@ -98,6 +98,9 @@ cat kdesignerplugin5_qt.lang %{name}-man.lang > %{name}.lang %changelog +* Thu Jun 07 2018 Rex Dieter - 5.47.0-2 +- cleanup, use %%majmin + * Sat Jun 02 2018 Rex Dieter - 5.47.0-1 - 5.47.0