diff --git a/.gitignore b/.gitignore index e11bfad..1bb3f13 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1 @@ -/kpty-5.27.0.tar.xz -/kpty-5.29.0.tar.xz -/kpty-5.31.0.tar.xz -/kpty-5.32.0.tar.xz -/kpty-5.33.0.tar.xz -/kpty-5.34.0.tar.xz -/kpty-5.35.0.tar.xz -/kpty-5.36.0.tar.xz -/kpty-5.37.0.tar.xz -/kpty-5.38.0.tar.xz -/kpty-5.39.0.tar.xz -/kpty-5.40.0.tar.xz -/kpty-5.41.0.tar.xz -/kpty-5.42.0.tar.xz -/kpty-5.43.0.tar.xz -/kpty-5.44.0.tar.xz -/kpty-5.45.0.tar.xz -/kpty-5.46.0.tar.xz /kpty-5.47.0.tar.xz diff --git a/kf5-kpty.spec b/kf5-kpty.spec index dbd3d51..de2d0a0 100755 --- a/kf5-kpty.spec +++ b/kf5-kpty.spec @@ -2,29 +2,28 @@ Name: kf5-%{framework} Version: 5.47.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 2 module providing Pty abstraction License: LGPLv2+ and GPLv2+ 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: kf5-kcoreaddons-devel >= %{version} -BuildRequires: kf5-ki18n-devel >= %{version} +BuildRequires: extra-cmake-modules >= %{majmin} +BuildRequires: kf5-rpm-macros +BuildRequires: kf5-kcoreaddons-devel >= %{majmin} +BuildRequires: kf5-ki18n-devel >= %{majmin} BuildRequires: libutempter-devel BuildRequires: qt5-qtbase-devel -Requires: kf5-filesystem >= %{version} # runtime calls %%_libexexdir/utempter/utempter Requires: libutempter @@ -53,17 +52,16 @@ pushd %{_target_platform} -DUTEMPTER_EXECUTABLE:PATH=/usr/libexec/utempter/utempter popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%find_lang kpty5_qt --with-qt --all-name +%find_lang --all-name --with-man --with-html -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -f kpty5_qt.lang %doc README.md @@ -79,6 +77,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