From 066080e646961d155d0c73edf4120c62ce1b569e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: May 27 2018 22:03:13 +0000 Subject: use %find_lang_kf5 %ldconfig_scriptlets enable bootstrap (minus webkit support) --- diff --git a/kf5-kdesignerplugin.spec b/kf5-kdesignerplugin.spec index bd770a9..0bf5064 100644 --- a/kf5-kdesignerplugin.spec +++ b/kf5-kdesignerplugin.spec @@ -1,8 +1,11 @@ %global framework kdesignerplugin +# uncomment to enable bootstrap mode +%global bootstrap 1 + Name: kf5-%{framework} Version: 5.46.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 integration module for Qt Designer License: LGPLv2+ @@ -22,17 +25,14 @@ BuildRequires: kf5-kconfig-devel >= %{version} BuildRequires: kf5-kcoreaddons-devel >= %{version} BuildRequires: kf5-kdoctools-devel >= %{version} BuildRequires: kf5-rpm-macros >= %{version} -#BuildRequires: qt5-designer-plugin-webkit BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtdeclarative-devel BuildRequires: qt5-qttools-devel BuildRequires: qt5-qttools-static -BuildRequires: qt5-qtwebkit-devel # optional requirements BuildRequires: kf5-kcompletion-devel >= %{version} BuildRequires: kf5-kconfigwidgets-devel >= %{version} -BuildRequires: kf5-kdewebkit-devel >= %{version} BuildRequires: kf5-kiconthemes-devel >= %{version} BuildRequires: kf5-kio-devel >= %{version} BuildRequires: kf5-kitemviews-devel >= %{version} @@ -42,7 +42,10 @@ BuildRequires: kf5-kwidgetsaddons-devel >= %{version} BuildRequires: kf5-kxmlgui-devel >= %{version} BuildRequires: kf5-sonnet-devel >= %{version} -Requires: kf5-filesystem >= %{version} +%if ! 0%{?bootstrap} +BuildRequires: qt5-qtwebkit-devel +BuildRequires: kf5-kdewebkit-devel >= %{version} +%endif Obsoletes: kf5-kdesignerplugin-devel < 5.18.0-2 Provides: kf5-kdesignerplugin-devel = %{version}-%{release} @@ -64,23 +67,25 @@ 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 kdesignerplugin5_qt --all-name --with-man --with-qt +%find_lang_kf5 kdesignerplugin5_qt -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -f kdesignerplugin5_qt.lang %doc README.md %license COPYING.LIB %{_kf5_bindir}/kgendesignerplugin -%{_kf5_qtplugindir}/designer/*.so +%{_kf5_qtplugindir}/designer/kf5widgets.so +%if !0%{?bootstrap} +%{_kf5_qtplugindir}/designer/kdewebkit5widgets.so +%endif %dir %{_kf5_datadir}/kf5/widgets/ %{_kf5_datadir}/kf5/widgets/* %{_kf5_mandir}/man1/kgendesignerplugin.1* @@ -89,6 +94,10 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Sun May 27 2018 Rex Dieter - 5.46.0-2 +- use %%find_lang_kf5 %%ldconfig_scriptlets +- enable bootstrap (minus webkit support) + * Sat May 05 2018 Rex Dieter - 5.46.0-1 - 5.46.0