From 0f7e4110eede4e88228cbdd342bb80b7b659b8d3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 7 Jun 2018 11:20:45 -0500 Subject: [PATCH] cleanup, use %majmin %make_build %ldconfig_scriptlets --- .gitignore | 10 ---------- kf5-kguiaddons.spec | 20 +++++++++++--------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 567d2c3..0e9ce1f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,2 @@ -/kguiaddons-5.36.0.tar.xz -/kguiaddons-5.37.0.tar.xz -/kguiaddons-5.38.0.tar.xz -/kguiaddons-5.39.0.tar.xz -/kguiaddons-5.40.0.tar.xz -/kguiaddons-5.41.0.tar.xz -/kguiaddons-5.42.0.tar.xz -/kguiaddons-5.43.0.tar.xz -/kguiaddons-5.44.0.tar.xz -/kguiaddons-5.45.0.tar.xz /kguiaddons-5.46.0.tar.xz /kguiaddons-5.47.0.tar.xz diff --git a/kf5-kguiaddons.spec b/kf5-kguiaddons.spec index 4a87522..734cc1e 100644 --- a/kf5-kguiaddons.spec +++ b/kf5-kguiaddons.spec @@ -2,29 +2,29 @@ Name: kf5-%{framework} Version: 5.47.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with various classes on top of QtGui 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 %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-rpm-macros >= %{version} +BuildRequires: extra-cmake-modules >= %{majmin} +BuildRequires: kf5-rpm-macros >= %{majmin} BuildRequires: libX11-devel BuildRequires: libxcb-devel BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtx11extras-devel -Requires: kf5-filesystem >= %{version} +Requires: kf5-filesystem >= %{majmin} %description KDBusAddons provides convenience classes on top of QtGui. @@ -48,15 +48,14 @@ pushd %{_target_platform} %{cmake_kf5} .. popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files %doc README.md @@ -72,6 +71,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Thu Jun 07 2018 Rex Dieter - 5.47.0-2 +- cleanup, use %%majmin %%make_build %%ldconfig_scriptlets + * Sat Jun 02 2018 Rex Dieter - 5.47.0-1 - 5.47.0