diff --git a/.gitignore b/.gitignore index 254a8c3..ede9ae6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1,2 @@ -/kconfig-5.18.0.tar.xz -/kconfig-5.19.0.tar.xz -/kconfig-5.20.0.tar.xz -/kconfig-5.21.0.tar.xz -/kconfig-5.22.0.tar.xz -/kconfig-5.23.0.tar.xz -/kconfig-5.24.0.tar.xz -/kconfig-5.25.0.tar.xz -/kconfig-5.26.0.tar.xz -/kconfig-5.27.0.tar.xz -/kconfig-5.29.0.tar.xz -/kconfig-5.31.0.tar.xz -/kconfig-5.32.0.tar.xz -/kconfig-5.33.0.tar.xz -/kconfig-5.34.0.tar.xz -/kconfig-5.35.0.tar.xz -/kconfig-5.36.0.tar.xz -/kconfig-5.37.0.tar.xz -/kconfig-5.38.0.tar.xz -/kconfig-5.39.0.tar.xz -/kconfig-5.40.0.tar.xz -/kconfig-5.41.0.tar.xz -/kconfig-5.42.0.tar.xz -/kconfig-5.43.0.tar.xz -/kconfig-5.44.0.tar.xz -/kconfig-5.45.0.tar.xz /kconfig-5.46.0.tar.xz /kconfig-5.47.0.tar.xz diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 9a15c79..41c966f 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -12,31 +12,31 @@ Name: kf5-%{framework} Version: 5.47.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT 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 ## upstreamable patches BuildRequires: ninja-build -BuildRequires: extra-cmake-modules >= %{version} -BuildRequires: kf5-rpm-macros >= %{version} +BuildRequires: extra-cmake-modules >= %{majmin} +BuildRequires: kf5-rpm-macros >= %{majmin} -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Xml) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Xml) BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qttools-devel @@ -57,7 +57,7 @@ BuildRequires: time BuildRequires: xorg-x11-server-Xvfb %endif -Requires: kf5-filesystem >= %{version} +Requires: kf5-filesystem >= %{majmin} Requires: %{name}-core%{?_isa} = %{version}-%{release} Requires: %{name}-gui%{?_isa} = %{version}-%{release} @@ -68,7 +68,7 @@ parts: KConfigCore and KConfigGui. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: cmake(Qt5Xml) +Requires: pkgconfig(Qt5Xml) %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -126,7 +126,7 @@ pushd %{_target_platform} %{?tests:-DBUILD_TESTING:BOOL=ON} popd -#make -C %{_target_platform} +#make_build -C %{_target_platform} %ninja_build -C %{_target_platform} @@ -134,7 +134,7 @@ popd #make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %ninja_install -C %{_target_platform} -%find_lang %{name} --all-name --with-qt +%find_lang_kf5 kconfig5_qt %check @@ -153,18 +153,16 @@ ninja test -v -C %{_target_platform} ||: %doc DESIGN README.md TODO %license COPYING.LIB -%post core -p /sbin/ldconfig -%postun core -p /sbin/ldconfig +%ldconfig_scriptlets core -%files core -f %{name}.lang +%files core -f kconfig5_qt.lang %{_kf5_bindir}/kreadconfig5 %{_kf5_bindir}/kwriteconfig5 %{_kf5_libdir}/libKF5ConfigCore.so.* %{_kf5_libexecdir}/kconfig_compiler_kf5 %{_kf5_libexecdir}/kconf_update -%post gui -p /sbin/ldconfig -%postun gui -p /sbin/ldconfig +%ldconfig_scriptlets gui %files gui %{_kf5_libdir}/libKF5ConfigGui.so.* @@ -192,6 +190,11 @@ ninja test -v -C %{_target_platform} ||: %changelog +* Thu Jun 07 2018 Rex Dieter - 5.47.0-2 +- cleanup +- use pkgconfig(Qt5...) style deps +- use %%majmin %%make_build %%find_lang_kf5 %%ldconfig_scriptlets + * Sat Jun 02 2018 Rex Dieter - 5.47.0-1 - 5.47.0