diff --git a/.gitignore b/.gitignore index 98d7f7c..8f755ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1 @@ -/knewstuff-5.36.0.tar.xz -/knewstuff-5.37.0.tar.xz -/knewstuff-5.38.0.tar.xz -/knewstuff-5.39.0.tar.xz -/knewstuff-5.40.0.tar.xz -/knewstuff-5.41.0.tar.xz -/knewstuff-5.42.0.tar.xz -/knewstuff-5.43.0.tar.xz -/knewstuff-5.44.0.tar.xz -/knewstuff-5.45.0.tar.xz -/knewstuff-5.46.0.tar.xz /knewstuff-5.47.0.tar.xz diff --git a/kf5-knewstuff.spec b/kf5-knewstuff.spec index a227a5a..1d18d42 100644 --- a/kf5-knewstuff.spec +++ b/kf5-knewstuff.spec @@ -2,46 +2,44 @@ Name: kf5-%{framework} Version: 5.47.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 module for downloading application assets 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 ## upstream patches # filter qml provides %global __provides_exclude_from ^%{_kf5_qmldir}/.*\\.so$ -BuildRequires: extra-cmake-modules >= %{version} -BuildRequires: kf5-attica-devel >= %{version} -BuildRequires: kf5-karchive-devel >= %{version} -BuildRequires: kf5-kcompletion-devel >= %{version} -BuildRequires: kf5-kconfig-devel >= %{version} -BuildRequires: kf5-kcoreaddons-devel >= %{version} -BuildRequires: kf5-ki18n-devel >= %{version} -BuildRequires: kf5-kiconthemes-devel >= %{version} -BuildRequires: kf5-kio-devel >= %{version} -BuildRequires: kf5-kitemviews-devel >= %{version} -BuildRequires: kf5-kservice-devel >= %{version} -BuildRequires: kf5-ktextwidgets-devel >= %{version} -BuildRequires: kf5-kwidgetsaddons-devel >= %{version} -BuildRequires: kf5-kxmlgui-devel >= %{version} -BuildRequires: kf5-rpm-macros >= %{version} +BuildRequires: extra-cmake-modules >= %{majmin} +BuildRequires: kf5-attica-devel >= %{majmin} +BuildRequires: kf5-karchive-devel >= %{majmin} +BuildRequires: kf5-kcompletion-devel >= %{majmin} +BuildRequires: kf5-kconfig-devel >= %{majmin} +BuildRequires: kf5-kcoreaddons-devel >= %{majmin} +BuildRequires: kf5-ki18n-devel >= %{majmin} +BuildRequires: kf5-kiconthemes-devel >= %{majmin} +BuildRequires: kf5-kio-devel >= %{majmin} +BuildRequires: kf5-kitemviews-devel >= %{majmin} +BuildRequires: kf5-kservice-devel >= %{majmin} +BuildRequires: kf5-ktextwidgets-devel >= %{majmin} +BuildRequires: kf5-kwidgetsaddons-devel >= %{majmin} +BuildRequires: kf5-kxmlgui-devel >= %{majmin} +BuildRequires: kf5-rpm-macros BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtdeclarative-devel -Requires: kf5-filesystem >= %{version} - %description KDE Frameworks 5 Tier 3 module for downloading and sharing additional application data like plugins, themes, motives, etc. @@ -49,10 +47,10 @@ application data like plugins, themes, motives, etc. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: kf5-attica-devel >= %{version} -Requires: kf5-kxmlgui-devel >= %{version} +Requires: kf5-attica-devel >= %{majmin} +Requires: kf5-kservice-devel >= %{majmin} +Requires: kf5-kxmlgui-devel >= %{majmin} Requires: qt5-qtbase-devel -Requires: kf5-kservice-devel >= %{version} %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -68,19 +66,18 @@ 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 knewstuff5_qt --with-qt --all-name +%find_lang %{name} --all-name -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets -%files -f knewstuff5_qt.lang +%files -f %{name}.lang %doc README.md %license COPYING.LIB %{_kf5_sysconfdir}/xdg/knewstuff.* @@ -107,6 +104,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Fri Jun 08 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