[plasma-mobile] conditionalize dirmodelplugin for < 4.10.80

Rex Dieter rdieter at fedoraproject.org
Wed Aug 14 00:44:19 UTC 2013


commit 53662438e3a970228a03a120a4da7a8d5dabe399
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Aug 13 19:44:12 2013 -0500

    conditionalize dirmodelplugin for < 4.10.80

 plasma-mobile.spec |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/plasma-mobile.spec b/plasma-mobile.spec
index fe3db24..5050b58 100644
--- a/plasma-mobile.spec
+++ b/plasma-mobile.spec
@@ -1,7 +1,7 @@
 
 Name:           plasma-mobile
 Version:        0.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Plasma Active mobile workspace
 
 License:        GPLv2+
@@ -26,6 +26,14 @@ Requires:       kde-artwork-active
 Requires:       kde-workspace%{?_kde4_version: >= %{_kde4_version}}
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
+%if "%{?_kde4_version}" < "4.10.80"
+%define dirmodel 1
+Conflicts: kde-runtime-libs > 4.10.80
+#else
+## this is already implicit in kde-workspace dep above -- rex
+#Requires: kde-runtime-libs%{?_isa}%{?_kde4_version: >= %{_kde4_version}}
+%endif
+
 %description
 A touch enabled Plasma Active workspace aiming on different
 (not only) mobile devices.
@@ -74,6 +82,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 ## unpackaged files
 rm -rfv %{buildroot}%{_kde4_appsdir}/plasma/services/powermanagementservice.operations
+%if !0%{?dirmodel}
+rm -rf %{buildroot}%{_kde4_libdir}/kde4/imports/org/kde/dirmodel/
+%endif
 
 
 %check
@@ -109,7 +120,9 @@ fi
 %{_kde4_bindir}/plasma-device
 %{_kde4_bindir}/plasma-widgetstrip
 %{_kde4_libdir}/kde4/imports/org/kde/active/
+%if 0%{?dirmodel}
 %{_kde4_libdir}/kde4/imports/org/kde/dirmodel/
+%endif
 %{_kde4_libdir}/kde4/imports/org/kde/metadatamodels/
 %{_kde4_libdir}/kde4/imports/org/kde/plasma/mobilecomponents/
 %{_kde4_libdir}/kde4/*.so
@@ -157,6 +170,9 @@ fi
 
 
 %changelog
+* Tue Aug 13 2013 Rex Dieter <rdieter at fedoraproject.org> 0.4-4
+- conditionalize dirmodelplugin for < 4.10.80
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list