[kactivities] libs subpkg
Rex Dieter
rdieter at fedoraproject.org
Wed May 14 11:22:26 UTC 2014
commit afd017d78fd3feb02e5a5f72bb7fa16be5e6bb50
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Wed May 14 06:22:18 2014 -0500
libs subpkg
kactivities.spec | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
---
diff --git a/kactivities.spec b/kactivities.spec
index 0363fe8..cfadd60 100644
--- a/kactivities.spec
+++ b/kactivities.spec
@@ -5,7 +5,7 @@
Name: kactivities
Summary: API for using and interacting with Activities
Version: 4.13.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+ and LGPLv2+
URL: https://projects.kde.org/projects/kde/kdelibs/kactivities
@@ -28,8 +28,6 @@ BuildRequires: devtoolset-1.1-gcc-c++
%global devtoolset 1
%endif
-Requires: kdelibs4%{?_isa}%{?_kde4_version: >= %{_kde4_version}}
-
# libkactivities moved from kdelibs, but turns out there's no actual conflicts
# kactivitymanagerd moved here from kde-runtime
Conflicts: kdebase-runtime < 4.7.3-10
@@ -37,10 +35,22 @@ Conflicts: kdebase-runtime < 4.7.3-10
Obsoletes: libkactivities < 6.1-100
Provides: libkactivities = 6.1-100
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
%description
API for using and interacting with Activities as a consumer,
application adding information to them or as an activity manager.
+%package libs
+Summary: Runtime libraries for %{name}
+Requires: kdelibs4%{?_isa}%{?_kde4_version: >= %{_kde4_version}}
+# upgrade path, when -libs was split out
+Obsoletes: kactivities < 4.13.1-3
+# Allow any kactivitiesd to satisfy this (ours here or kf5 one)
+Requires: kactivities >= %{version}
+%description libs
+%{summary}.
+
%if 0%{?nepomuk}
%package nepomuk
Summary: KActivities nepomuk support
@@ -48,7 +58,7 @@ BuildRequires: nepomuk-core-devel >= %{version}
BuildRequires: pkgconfig(soprano)
# upgrade path
Obsoletes: kactivities < 4.13.0-2
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# not sure if an explicit dep is needed or worth it -- rex
#Requires: nepomuk-core%{?_isa} >= %{version}
%description nepomuk
@@ -59,7 +69,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Summary: Developer files for %{name}
Obsoletes: libkactivities-devel < 6.1-100
Provides: libkactivities-devel = 6.1-100
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%if 0%{?nepomuk}
Requires: %{name}-nepomuk%{?_isa} = %{version}-%{release}
%endif
@@ -115,7 +125,6 @@ rm -rfv %{buildroot}%{_kde4_datadir}/ontology/kde/
%files
%{_kde4_bindir}/kactivitymanagerd
-%{_kde4_libdir}/libkactivities.so.6*
%{_kde4_libdir}/kde4/activitymanager_plugin_activityranking.so
%{_kde4_libdir}/kde4/activitymanager_plugin_globalshortcuts.so
%{_kde4_libdir}/kde4/activitymanager_plugin_slc.so
@@ -132,6 +141,12 @@ rm -rfv %{buildroot}%{_kde4_datadir}/ontology/kde/
%{_kde4_datadir}/kde4/servicetypes/activitymanager-plugin.desktop
%{_kde4_appsdir}/activitymanager/
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+%files libs
+%{_kde4_libdir}/libkactivities.so.6*
+
%if 0%{?nepomuk}
%post nepomuk -p /sbin/ldconfig
%postun nepomuk -p /sbin/ldconfig
@@ -164,6 +179,9 @@ rm -rfv %{buildroot}%{_kde4_datadir}/ontology/kde/
%changelog
+* Wed May 14 2014 Rex Dieter <rdieter at fedoraproject.org> 4.13.1-3
+- -libs subpkg
+
* Tue May 13 2014 Rex Dieter <rdieter at fedoraproject.org> 4.13.1-2
- -nepomuk subpkg instead (still needed by plasma-mobile, at least)
More information about the scm-commits
mailing list