diff --git a/.gitignore b/.gitignore index b8c7700..2dab3f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1 @@ -/kjobwidgets-5.18.0.tar.xz -/kjobwidgets-5.19.0.tar.xz -/kjobwidgets-5.20.0.tar.xz -/kjobwidgets-5.21.0.tar.xz -/kjobwidgets-5.22.0.tar.xz -/kjobwidgets-5.23.0.tar.xz -/kjobwidgets-5.24.0.tar.xz -/kjobwidgets-5.25.0.tar.xz -/kjobwidgets-5.26.0.tar.xz -/kjobwidgets-5.27.0.tar.xz -/kjobwidgets-5.29.0.tar.xz -/kjobwidgets-5.31.0.tar.xz -/kjobwidgets-5.32.0.tar.xz -/kjobwidgets-5.33.0.tar.xz -/kjobwidgets-5.34.0.tar.xz -/kjobwidgets-5.35.0.tar.xz -/kjobwidgets-5.36.0.tar.xz -/kjobwidgets-5.37.0.tar.xz -/kjobwidgets-5.38.0.tar.xz -/kjobwidgets-5.39.0.tar.xz -/kjobwidgets-5.40.0.tar.xz -/kjobwidgets-5.41.0.tar.xz -/kjobwidgets-5.42.0.tar.xz -/kjobwidgets-5.43.0.tar.xz -/kjobwidgets-5.44.0.tar.xz -/kjobwidgets-5.45.0.tar.xz -/kjobwidgets-5.46.0.tar.xz /kjobwidgets-5.47.0.tar.xz diff --git a/kf5-kjobwidgets.spec b/kf5-kjobwidgets.spec index 7885a53..f0ed83d 100755 --- a/kf5-kjobwidgets.spec +++ b/kf5-kjobwidgets.spec @@ -2,32 +2,30 @@ Name: kf5-%{framework} Version: 5.47.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 2 addon for KJobs 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-kcoreaddons-devel >= %{version} -BuildRequires: kf5-kwidgetsaddons-devel >= %{version} -BuildRequires: kf5-rpm-macros >= %{version} +BuildRequires: extra-cmake-modules >= %{majmin} +BuildRequires: kf5-kcoreaddons-devel >= %{majmin} +BuildRequires: kf5-kwidgetsaddons-devel >= %{majmin} +BuildRequires: kf5-rpm-macros BuildRequires: libX11-devel BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qttools-devel BuildRequires: qt5-qtx11extras-devel -Requires: kf5-filesystem >= %{version} - %description KDE Frameworks 5 Tier 2 addon for KJobs @@ -51,17 +49,16 @@ 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} -%find_lang kjobwidgets5_qt --with-qt --all-name +%find_lang_kf5 kjobwidgets5_qt -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -f kjobwidgets5_qt.lang %doc README.md @@ -79,6 +76,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 %%find_lang_kf5 %%ldconfig_scriptlets + * Sat Jun 02 2018 Rex Dieter - 5.47.0-1 - 5.47.0