rdieter pushed to plasma-workspace (f22). "conflicts with kf5-kxmlrpcclient (#1208947) (..more)"

[notifications at fedoraproject.org]

>From d3b2f218361dda68bbab7780d86d477102cbba62 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 4 Apr 2015 20:22:04 -0500
Subject: conflicts with kf5-kxmlrpcclient (#1208947)

Requires: kf5-kxmlrpcclient >= 5.8 and omit libkxmlrpcclient5.mo here

alternative is to backport 5.3 commit to use kf5-kxmlrpcclient instead of bundled copy

diff --git a/plasma-workspace.spec b/plasma-workspace.spec
index 82c91f0..9cd96e8 100644
--- a/plasma-workspace.spec
+++ b/plasma-workspace.spec
@@ -1,6 +1,6 @@
 Name:           plasma-workspace
 Version:        5.2.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Plasma workspace, applications and applets
 License:        GPLv2+
 URL:            https://projects.kde.org/projects/kde/workspace/plasma-workspace
@@ -124,6 +124,8 @@ Requires:       qt5-qtgraphicaleffects
 Requires:       kf5-filesystem
 Requires:       kf5-baloo
 Requires:       kf5-kglobalaccel >= 5.7
+# for translations mostly, can drop for plasma-5.3 (#1208947) -- rex
+Requires:       kf5-kxmlrpcclient >= 5.8
 Requires:       khotkeys
 
 # Without the platformtheme plugins we get broken fonts
@@ -185,6 +187,9 @@ Documentation and user manuals for %{name}.
 mv startkde/startkde.cmake startkde/startkde.cmake.orig
 install -m644 -p %{SOURCE11} startkde/startkde.cmake
 
+# omit conflicts with kf5-kxmlrpcclient-5.8
+rm -fv po/*/libkxmlrpcclient5.po
+
 
 %build
 mkdir %{_target_platform}
@@ -278,6 +283,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/{plasma-windowed,org
 
 
 %changelog
+* Sat Apr 04 2015 Rex Dieter <rdieter at fedoraproject.org> 5.2.2-5
+- conflicts with kf5-kxmlrpcclient (#1208947)
+
 * Tue Mar 31 2015 Rex Dieter <rdieter at fedoraproject.org> 5.2.2-4
 - Requires: khotkeys (#1207079)
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/plasma-workspace.git/commit/?h=f22&id=d3b2f218361dda68bbab7780d86d477102cbba62