From c9be29bf37e91c18db682f0e198415d831aff46d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jun 28 2018 17:10:00 +0000 Subject: use %make_build %ldconfig_scriptlets --- diff --git a/kactivities.spec b/kactivities.spec index 3fb7674..dafcc49 100644 --- a/kactivities.spec +++ b/kactivities.spec @@ -12,7 +12,7 @@ Name: kactivities Summary: API for using and interacting with Activities Version: 4.13.3 -Release: 25%{?dist} +Release: 26%{?dist} License: GPLv2+ and LGPLv2+ URL: https://projects.kde.org/projects/kde/kdelibs/kactivities @@ -106,7 +106,7 @@ pushd %{_target_platform} %{cmake_kde4} .. popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} %if 0%{?devtoolset:1} # build missing pieces with separate compiler @@ -115,12 +115,12 @@ PATH=`scl enable devtoolset-1.1 'echo "$PATH"'`; export PATH CXXFLAGS=`echo $RPM_OPT_FLAGS | sed 's|-g |-gdwarf-3 -gstrict-dwarf |g'` mkdir %{_target_platform}-devtoolset -pushd %{_target_platform}-devtoolset +pushd %{_target_platform}-devtoolset %{cmake_kde4} .. popd -make %{?_smp_mflags} -C %{_target_platform}-devtoolset/src/service -make %{?_smp_mflags} -C %{_target_platform}-devtoolset/src/workspace +%make_build -C %{_target_platform}-devtoolset/src/service +%make_build -C %{_target_platform}-devtoolset/src/workspace %endif @@ -162,8 +162,7 @@ rm -fv %{buildroot}%{_kde4_datadir}/kde4/servicetypes/activitymanager-plugin.des %{_kde4_datadir}/kde4/servicetypes/activitymanager-plugin.desktop %endif -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +%ldconfig_scriptlets libs %files libs %{_kde4_libdir}/libkactivities.so.6* @@ -179,8 +178,7 @@ rm -fv %{buildroot}%{_kde4_datadir}/kde4/servicetypes/activitymanager-plugin.des %{_kde4_includedir}/kactivities/ %if 0%{?nepomuk} -%post nepomuk -p /sbin/ldconfig -%postun nepomuk -p /sbin/ldconfig +%ldconfig_scriptlets nepomuk %files nepomuk %{_kde4_libdir}/kde4/kio_activities.so @@ -203,6 +201,9 @@ rm -fv %{buildroot}%{_kde4_datadir}/kde4/servicetypes/activitymanager-plugin.des %changelog +* Thu Jun 28 2018 Rex Dieter - 4.13.3-26 +- use %%make_build %%ldconfig_scriptlets + * Wed Feb 07 2018 Fedora Release Engineering - 4.13.3-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild