From 0757deb896be4c559fdd23ad2bac2888cff5b75d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jun 07 2018 16:31:35 +0000 Subject: cleanup, use %majmin %make_build %ldconfig_scriptlets --- diff --git a/.gitignore b/.gitignore index 1cc3f46..18e3d6c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1,2 @@ -/kplotting-5.18.0.tar.xz -/kplotting-5.19.0.tar.xz -/kplotting-5.20.0.tar.xz -/kplotting-5.21.0.tar.xz -/kplotting-5.22.0.tar.xz -/kplotting-5.23.0.tar.xz -/kplotting-5.24.0.tar.xz -/kplotting-5.25.0.tar.xz -/kplotting-5.26.0.tar.xz -/kplotting-5.27.0.tar.xz -/kplotting-5.29.0.tar.xz -/kplotting-5.31.0.tar.xz -/kplotting-5.32.0.tar.xz -/kplotting-5.33.0.tar.xz -/kplotting-5.34.0.tar.xz -/kplotting-5.35.0.tar.xz -/kplotting-5.36.0.tar.xz -/kplotting-5.37.0.tar.xz -/kplotting-5.38.0.tar.xz -/kplotting-5.39.0.tar.xz -/kplotting-5.40.0.tar.xz -/kplotting-5.41.0.tar.xz -/kplotting-5.42.0.tar.xz -/kplotting-5.43.0.tar.xz -/kplotting-5.44.0.tar.xz -/kplotting-5.45.0.tar.xz /kplotting-5.46.0.tar.xz /kplotting-5.47.0.tar.xz diff --git a/kf5-kplotting.spec b/kf5-kplotting.spec index 304c75c..4bf141a 100644 --- a/kf5-kplotting.spec +++ b/kf5-kplotting.spec @@ -2,28 +2,28 @@ Name: kf5-%{framework} Version: 5.47.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon for plotting 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: pcre-devel BuildRequires: perl-interpreter BuildRequires: qt5-qtbase-devel -Requires: kf5-filesystem >= %{version} +Requires: kf5-filesystem >= %{majmin} %description KPlotting provides classes to do plotting. @@ -47,15 +47,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 @@ -71,6 +70,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