diff --git a/kf5-frameworkintegration.spec b/kf5-frameworkintegration.spec index 4ddd7c5..1fb21fa 100644 --- a/kf5-frameworkintegration.spec +++ b/kf5-frameworkintegration.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.43.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: KDE Frameworks 5 Tier 4 workspace and cross-framework integration plugins License: LGPLv2+ URL: https://cgit.kde.org/%{framework}.git @@ -40,25 +40,11 @@ BuildRequires: cmake(AppStreamQt) BuildRequires: cmake(packagekitqt5) %endif -Requires: kf5-filesystem >= %{version} -# as of 5.17.0, src/platformtheme/kfontsettingsdata.cpp references: Noto Sans, Oxygen-Mono -# not sure if that warrants hard deps here though -- Rex -%if ! 0%{?bootstrap} -BuildRequires: google-noto-sans-fonts -BuildRequires: oxygen-mono-fonts -%endif -%if 0%{?fedora} > 22 -Recommends: google-noto-sans-fonts -Recommends: oxygen-mono-fonts -%else -Requires: google-noto-sans-fonts -Requires: oxygen-mono-fonts -%endif - # prior to 5.11.0-3, main pkg was multilib'd (due to arch'd -devel deps) -- rex Obsoletes: %{name} < 5.11.0-3 Requires: %{name}-libs%{?_isa} = %{version}-%{release} +## consider removing for f28+, since Qt5 tracks via versioned symbols now -- rex BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} @@ -90,28 +76,17 @@ developing applications that use %{name}. %build -# workaround for http://bugzilla.redhat.com/1255902 -%if 0%{?fedora} == 22 -CFLAGS="%{optflags} -fno-strict-aliasing" -CXXFLAGS="%{optflags} -fno-strict-aliasing" -export CFLAGS CXXFLAGS -%endif - mkdir %{_target_platform} 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} -## unpackaged files -# fedora never defaulted to oxygen-fonts, nor particularly care about forcing any oxygen->noto switch either -- rex -rm -fv %{buildroot}%{_kf5_datadir}/kconf_update/frameworksintegration-5.16-font.* - %files %doc README.md @@ -119,13 +94,13 @@ rm -fv %{buildroot}%{_kf5_datadir}/kconf_update/frameworksintegration-5.16-font. %{_kf5_datadir}/kf5/infopage/ %{_kf5_datadir}/knotifications5/plasma_workspace.notifyrc %dir %{_kf5_libexecdir}/kpackagehandlers +%{_kf5_libexecdir}/kpackagehandlers/knshandler +# move to subpkg? -- rex %if 0%{?appstream} %{_kf5_libexecdir}/kpackagehandlers/appstreamhandler %endif -%{_kf5_libexecdir}/kpackagehandlers/knshandler -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +%ldconfig_scriptlets libs %files libs %{_kf5_libdir}/libKF5Style.so.* @@ -139,6 +114,11 @@ rm -fv %{buildroot}%{_kf5_datadir}/kconf_update/frameworksintegration-5.16-font. %changelog +* Mon Feb 19 2018 Rex Dieter - 5.43.0-4 +- drop kde-filesystem dep, old cruft +- drop font deps (no longer needed or used) +- use %%ldconfig_scriptles %%make_build + * Wed Feb 14 2018 Jan Grulich - 5.43.0-3 - rebuild (qt5)