[kde-workspace/f21] fix the colorschemes.knsrc file conflict correctly (also patch the code)

[Kevin Kofler]

commit 8c0357fc0b20d5bff974528d58f7d6779abe4116
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Mar 7 02:56:10 2015 +0100

    fix the colorschemes.knsrc file conflict correctly (also patch the code)
    
    * Sat Mar 07 2015 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.11.16-3
    - fix the colorschemes.knsrc file conflict correctly (also patch the code)

 kde-workspace-4.11.16-colorschemes-kde4.patch | 33 +++++++++++++++++++++++++++
 kde-workspace.spec                            | 13 +++++++----
 2 files changed, 41 insertions(+), 5 deletions(-)
---
diff --git a/kde-workspace-4.11.16-colorschemes-kde4.patch b/kde-workspace-4.11.16-colorschemes-kde4.patch
new file mode 100644
index 0000000..47b991f
--- /dev/null
+++ b/kde-workspace-4.11.16-colorschemes-kde4.patch
@@ -0,0 +1,33 @@
+diff -ur kde-workspace-4.11.16/kcontrol/colors/CMakeLists.txt kde-workspace-4.11.16-colorschemes-kde4/kcontrol/colors/CMakeLists.txt
+--- kde-workspace-4.11.16/kcontrol/colors/CMakeLists.txt	2015-01-29 19:49:17.000000000 +0100
++++ kde-workspace-4.11.16-colorschemes-kde4/kcontrol/colors/CMakeLists.txt	2015-03-07 02:36:25.000000000 +0100
+@@ -9,7 +9,7 @@
+ 
+ install(TARGETS kcm_colors  DESTINATION ${PLUGIN_INSTALL_DIR})
+ install( FILES colors.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+-install( FILES colorschemes.knsrc DESTINATION  ${CONFIG_INSTALL_DIR} )
++install( FILES colorschemes.knsrc DESTINATION  ${CONFIG_INSTALL_DIR} RENAME "colorschemes-kde4.knsrc" )
+ 
+ # built-in color schemes
+ FILE(GLOB schemefiles schemes/*.colors)
+diff -ur kde-workspace-4.11.16/kcontrol/colors/colorscm.cpp kde-workspace-4.11.16-colorschemes-kde4/kcontrol/colors/colorscm.cpp
+--- kde-workspace-4.11.16/kcontrol/colors/colorscm.cpp	2015-01-29 19:49:17.000000000 +0100
++++ kde-workspace-4.11.16-colorschemes-kde4/kcontrol/colors/colorscm.cpp	2015-03-07 02:36:54.000000000 +0100
+@@ -397,7 +397,7 @@
+ 
+ void KColorCm::on_schemeKnsButton_clicked()
+ {
+-    KNS3::DownloadDialog dialog("colorschemes.knsrc", this);
++    KNS3::DownloadDialog dialog("colorschemes-kde4.knsrc", this);
+     dialog.exec();
+     if ( ! dialog.changedEntries().isEmpty() )
+     {
+@@ -428,7 +428,7 @@
+         }
+ 
+         // upload
+-        KNS3::UploadDialog dialog("colorschemes.knsrc", this);
++        KNS3::UploadDialog dialog("colorschemes-kde4.knsrc", this);
+         dialog.setUploadFile(KUrl(path) );
+         dialog.exec();
+     }
diff --git a/kde-workspace.spec b/kde-workspace.spec
index f16e0d3..3ae8beb 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -22,7 +22,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.11.16
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -86,6 +86,9 @@ Patch26: kde-workspace-4.10.2-systray_org.kde.ktp-presence.patch
 # add support for automatic multi-seat provided by systemd using existing reserve seats in KDM
 Patch27: kde-workspace-4.11.1-kdm-logind-multiseat.patch
 
+# avoid conflict between kcm_colors 4 and plasma-desktop 5
+Patch28: kde-workspace-4.11.16-colorschemes-kde4.patch
+
 ## upstreamable patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
 Patch50: kde-workspace-4.10.90-kde#171685.patch
@@ -526,6 +529,7 @@ Conflicts: kde-workspace < 4.11.15-3
 %patch25 -p1 -b .bz#747982-launchers
 %patch26 -p1 -b .systray_org.kde.ktp-presence
 %patch27 -p1 -b .kdm_logind
+%patch28 -p1 -b .colorschemes-kde4
 
 # upstreamable patches
 %patch50 -p1 -b .kde#171685
@@ -638,10 +642,6 @@ for f in kcontrol/colors kmenuedit kcontrol/windowbehaviour kcontrol/kwindecorat
    bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache
 done
 
-# Avoid conflict between kcm_colors and plasma-desktop
-mv %{buildroot}%{_kde4_configdir}/colorschemes.knsrc \
-   %{buildroot}%{_kde4_configdir}/colorschemes-kde4.knsrc
-
 
 %check
 for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
@@ -1255,6 +1255,9 @@ fi
 
 
 %changelog
+* Sat Mar 07 2015 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.11.16-3
+- fix the colorschemes.knsrc file conflict correctly (also patch the code)
+
 * Fri Mar 06 2015 Rex Dieter <rdieter at fedoraproject.org> 4.11.16-2
 - kcm_colors: avoid conflict with plasma-desktop