rdieter pushed to kde-runtime (f21). "Merge branch 'master' into f21"

Tue Jun 2 20:17:17 UTC 2015

From 93ba0ecf7967db422580d8c59d23c265849cee83 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 30 May 2015 09:04:04 -0500
Subject: omit kdesu,khelpcenter where plasma5 is present (f22+)

diff --git a/kde-runtime.spec b/kde-runtime.spec
index 7bb8ee1..22f741b 100644
--- a/kde-runtime.spec
+++ b/kde-runtime.spec
@@ -3,10 +3,14 @@
 %define webkit 1
 %endif
 
+%if 0%{?fedora} > 21
+%define plasma5 1
+%endif
+
 Name:    kde-runtime
 Summary: KDE Runtime
 Version: 15.04.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+ and GPLv2+
@@ -279,10 +283,23 @@ rm -vf  %{buildroot}%{_kde4_libdir}/lib{kwalletbackend,molletnetwork}.so
 chrpath --list   %{buildroot}%{_libdir}/kde4/plugins/phonon_platform/kde.so ||:
 chrpath --delete %{buildroot}%{_libdir}/kde4/plugins/phonon_platform/kde.so
 
+## unpackaged files
 %if 0%{?rhel}
-  rm -f %{buildroot}%{_kde4_datadir}/kde4/services/searchproviders/fedora.desktop
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/searchproviders/fedora.desktop
+%endif
+
+%if 0%{?plasma5}
+rm -fv  %{buildroot}%{_kde4_bindir}/{kdesu,khelpcenter}
+rm -fv  %{buildroot}%{_kde4_libexecdir}/khc_*
+rm -fv  %{buildroot}%{_kde4_libdir}/libkdeinit4_khelpcenter.so
+rm -frv %{buildroot}%{_kde4_docdir}/HTML/en/{kdesu,khelpcenter,fundamentals,onlinehelp}
+rm -frv %{buildroot}%{_kde4_appsdir}/khelpcenter/
+rm -fv  %{buildroot}%{_kde4_datadir}/services/khelpcenter.desktop
+rm -fv  %{buildroot}%{_kde4_datadir}/config.kcfg/khelpcenter.kcfg
+rm -fv  %{buildroot}%{_mandir}/man1/kdesu.1*
 %endif
 
+
 %check
 for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
   desktop-file-validate $f
@@ -356,11 +373,8 @@ fi
 %{_kde4_appsdir}/kwalletd/
 %{_kde4_appsdir}/libphonon/
 %{_kde4_appsdir}/phonon/
-%dir %{_kde4_appsdir}/remoteview/
-%{_kde4_appsdir}/remoteview/network.desktop
 %{_kde4_configdir}/*.knsrc
-%{_kde4_datadir}/config.kcfg/*.kcfg
-%exclude %{_kde4_datadir}/config.kcfg/khelpcenter.kcfg
+%{_kde4_datadir}/config.kcfg/jpegcreatorsettings.kcfg
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/services/*.service
 %{_datadir}/dbus-1/system-services/*.service
@@ -376,8 +390,10 @@ fi
 %{_kde4_datadir}/sounds/*
 %{_kde4_iconsdir}/default.kde4
 %{_kde4_libdir}/kconf_update_bin/*
-%{_kde4_libdir}/libkdeinit4_*.so
-%exclude %{_kde4_libdir}/libkdeinit4_khelpcenter.so
+%{_kde4_libdir}/libkdeinit4_kcmshell4.so
+%{_kde4_libdir}/libkdeinit4_kglobalaccel.so
+%{_kde4_libdir}/libkdeinit4_kuiserver.so
+%{_kde4_libdir}/libkdeinit4_kwalletd.so
 %{_kde4_libdir}/kde4/platformimports/
 %{_kde4_libdir}/kde4/kcm_*.so
 %{_kde4_libdir}/kde4/kded_*.so
@@ -463,14 +479,15 @@ fi
 %{_kde4_docdir}/HTML/en/kioslave/
 %{_kde4_docdir}/HTML/en/knetattach/
 
+%if ! 0%{?plasma5}
 %files -n khelpcenter
 %{_kde4_bindir}/khelpcenter
 %{_kde4_libexecdir}/khc_*
 %{_kde4_libdir}/libkdeinit4_khelpcenter.so
-%{_kde4_docdir}/HTML/en/khelpcenter
-%{_kde4_docdir}/HTML/en/fundamentals
-%{_kde4_docdir}/HTML/en/onlinehelp
-%{_kde4_appsdir}/khelpcenter
+%{_kde4_docdir}/HTML/en/khelpcenter/
+%{_kde4_docdir}/HTML/en/fundamentals/
+%{_kde4_docdir}/HTML/en/onlinehelp/
+%{_kde4_appsdir}/khelpcenter/
 %{_kde4_datadir}/kde4/services/khelpcenter.desktop
 %{_kde4_datadir}/services/khelpcenter.desktop
 %{_kde4_datadir}/config.kcfg/khelpcenter.kcfg
@@ -478,12 +495,16 @@ fi
 
 %files -n kdesu
 %{_kde4_bindir}/kdesu
-%{_kde4_docdir}/HTML/en/kdesu
+%{_kde4_docdir}/HTML/en/kdesu/
 %{_mandir}/man1/kdesu.1*
 ## include non-conflicting libexec bits here too ? -- rex
+%endif
 
 
 %changelog
+* Sat May 30 2015 Rex Dieter <rdieter at fedoraproject.org> 15.04.1-2
+- omit kdesu,khelpcenter where plasma5 is present (f22+)
+
 * Thu May 14 2015 Rex Dieter <rdieter at fedoraproject.org> 15.04.1-1
 - 15.04.1
 
-- 
cgit v0.10.2


From 7e9999e710391ef02164cb6d1dba1dfc3868f9cb Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sat, 30 May 2015 09:22:27 -0500
Subject: fix %%files


diff --git a/kde-runtime.spec b/kde-runtime.spec
index 22f741b..bdd6915 100644
--- a/kde-runtime.spec
+++ b/kde-runtime.spec
@@ -373,6 +373,8 @@ fi
 %{_kde4_appsdir}/kwalletd/
 %{_kde4_appsdir}/libphonon/
 %{_kde4_appsdir}/phonon/
+%dir %{_kde4_appsdir}/remoteview/
+%{_kde4_appsdir}/remoteview/network.desktop
 %{_kde4_configdir}/*.knsrc
 %{_kde4_datadir}/config.kcfg/jpegcreatorsettings.kcfg
 %{_datadir}/dbus-1/interfaces/*.xml
-- 
cgit v0.10.2


From 8dd2a1e4f21de62334bc0b3e2c21707bc86537c1 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 1 Jun 2015 20:29:59 -0500
Subject: 15.04.2


diff --git a/.gitignore b/.gitignore
index 571366c..1a4ce47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /kde-runtime-15.04.1.tar.xz
+/kde-runtime-15.04.2.tar.xz
diff --git a/kde-runtime.spec b/kde-runtime.spec
index bdd6915..5ff490b 100644
--- a/kde-runtime.spec
+++ b/kde-runtime.spec
@@ -9,8 +9,8 @@
 
 Name:    kde-runtime
 Summary: KDE Runtime
-Version: 15.04.1
-Release: 2%{?dist}
+Version: 15.04.2
+Release: 1%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+ and GPLv2+
@@ -504,6 +504,9 @@ fi
 
 
 %changelog
+* Tue Jun 02 2015 Rex Dieter <rdieter at fedoraproject.org> - 15.04.2-1
+- 15.04.2
+
 * Sat May 30 2015 Rex Dieter <rdieter at fedoraproject.org> 15.04.1-2
 - omit kdesu,khelpcenter where plasma5 is present (f22+)
 
diff --git a/sources b/sources
index 2e88e35..dbf5083 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b8d3aea8206b41066ae16c97d8d07aa9  kde-runtime-15.04.1.tar.xz
+75bedb5ed5783b3a9231ee365df80f3d  kde-runtime-15.04.2.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kde-runtime.git/commit/?h=f21&id=2dc25b3153066ff235d2bc4d0d4a362dee1d3d39
