rdieter pushed to kactivities (f22). "omit kactivities base pkg where plasma5 is present (#1226502)"

[notifications at fedoraproject.org]

From a697faa7c3851fce20f4dcc19398a8d41be06e36 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 30 May 2015 12:37:05 -0500
Subject: omit kactivities base pkg where plasma5 is present (#1226502)


diff --git a/kactivities.spec b/kactivities.spec
index ff55631..58d08a5 100644
--- a/kactivities.spec
+++ b/kactivities.spec
@@ -2,10 +2,14 @@
 ## include -nepomuk subpkg support
 %define nepomuk 1
 
+%if 0%{?fedora} > 21
+%define plasma5 1
+%endif
+
 Name:    kactivities
 Summary: API for using and interacting with Activities 
 Version: 4.13.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: GPLv2+ and LGPLv2+
 URL:     https://projects.kde.org/projects/kde/kdelibs/kactivities
@@ -91,12 +95,17 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 
 
 %build
-mkdir -p %{_target_platform}
+mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
 
+%if 0%{?plasma5}
+make %{?_smp_mflags} -C %{_target_platform}/src/lib
+make %{?_smp_mflags} -C %{_target_platform}/src/workspace/settings/
+%else
 make %{?_smp_mflags} -C %{_target_platform}
+%endif
 
 %if 0%{?devtoolset:1}
 # build missing pieces with separate compiler
@@ -104,7 +113,7 @@ PATH=`scl enable devtoolset-1.1 'echo "$PATH"'`; export PATH
 
 CXXFLAGS=`echo $RPM_OPT_FLAGS | sed 's|-g |-gdwarf-3 -gstrict-dwarf |g'`
 
-mkdir -p %{_target_platform}-devtoolset
+mkdir %{_target_platform}-devtoolset
 pushd  %{_target_platform}-devtoolset
 %{cmake_kde4} ..
 popd
@@ -115,7 +124,12 @@ make %{?_smp_mflags} -C %{_target_platform}-devtoolset/src/workspace
 
 
 %install
+%if 0%{?plasma5}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/src/lib
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/src/workspace/settings/
+%else
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%endif
 
 %if 0%{?devtoolset:1}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-devtoolset/src/service
@@ -128,9 +142,7 @@ rm -rfv %{buildroot}%{_kde4_datadir}/ontology/kde/
 %endif
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
+%if ! 0%{?plasma5}
 %files
 %{_kde4_bindir}/kactivitymanagerd
 %{_kde4_libdir}/kde4/activitymanager_plugin_activityranking.so
@@ -145,6 +157,7 @@ rm -rfv %{buildroot}%{_kde4_datadir}/ontology/kde/
 %{_kde4_datadir}/kde4/services/activitymanager-plugin-virtualdesktopswitch.desktop
 %{_kde4_datadir}/kde4/services/kactivitymanagerd.desktop
 %{_kde4_datadir}/kde4/servicetypes/activitymanager-plugin.desktop
+%endif
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
@@ -187,6 +200,9 @@ rm -rfv %{buildroot}%{_kde4_datadir}/ontology/kde/
 
 
 %changelog
+* Sat May 30 2015 Rex Dieter <rdieter at fedoraproject.org> 4.13.3-9
+- omit kactivities base pkg where plasma5 is present (#1226502)
+
 * Sat May 02 2015 Kalev Lember <kalevlember at gmail.com> - 4.13.3-8
 - Rebuilt for GCC 5 C++11 ABI change
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kactivities.git/commit/?h=f22&id=a697faa7c3851fce20f4dcc19398a8d41be06e36