drop hacked klipper/prison support (until we have kf5-prison available properly)

plasma-workspace-5.4.2-prison-qt5.patch

@@ -1,71 +0,0 @@
-diff -up plasma-workspace-5.4.2/klipper/clipboardjob.cpp.prison-qt5 plasma-workspace-5.4.2/klipper/clipboardjob.cpp
---- plasma-workspace-5.4.2/klipper/clipboardjob.cpp.prison-qt5	2015-10-01 04:56:51.000000000 -0500
-+++ plasma-workspace-5.4.2/klipper/clipboardjob.cpp	2015-10-20 12:28:13.427524814 -0500
-@@ -28,10 +28,10 @@ along with this program.  If not, see <h
- #include <QIcon>
- 
- #ifdef HAVE_PRISON
--#include <prison/QRCodeBarcode>
--#include <prison/DataMatrixBarcode>
--#include <prison/Code39Barcode>
--#include <prison/Code93Barcode>
-+#include <prison-qt5/QRCodeBarcode>
-+#include <prison-qt5/DataMatrixBarcode>
-+#include <prison-qt5/Code39Barcode>
-+#include <prison-qt5/Code93Barcode>
- #endif
- 
- const static QString s_iconKey = QStringLiteral("icon");
-diff -up plasma-workspace-5.4.2/klipper/CMakeLists.txt.prison-qt5 plasma-workspace-5.4.2/klipper/CMakeLists.txt
---- plasma-workspace-5.4.2/klipper/CMakeLists.txt.prison-qt5	2015-10-01 04:56:51.000000000 -0500
-+++ plasma-workspace-5.4.2/klipper/CMakeLists.txt	2015-10-20 12:29:19.011990523 -0500
-@@ -19,14 +19,14 @@ set(libklipper_common_SRCS
-     clipcommandprocess.cpp
- )
- 
--find_package(KF5Prison "1.2.0" QUIET CONFIG)
--set_package_properties(KF5Prison PROPERTIES DESCRIPTION "Prison library"
-+find_package(Prison-qt5 QUIET CONFIG)
-+set_package_properties(Prison-qt5 PROPERTIES DESCRIPTION "Prison library"
-                        URL "http://projects.kde.org/prison"
-                        TYPE OPTIONAL
-                        PURPOSE "Needed to create mobile barcodes from clipboard data (no stable release currently)"
-                       )
- 
--set(HAVE_PRISON ${KF5Prison_FOUND})
-+set(HAVE_PRISON ${PRISON_FOUND})
- configure_file(config-klipper.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-klipper.h )
- 
- kde4_add_app_icon(libklipper_common_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/klipper.png")
-@@ -58,7 +58,7 @@ if (X11_FOUND)
-   target_link_libraries(kdeinit_klipper XCB::XCB Qt5::X11Extras)
- endif()
- if (HAVE_PRISON)
--  target_link_libraries(kdeinit_klipper KF5::Prison)
-+  target_link_libraries(kdeinit_klipper ${PRISON_LIBRARIES})
- endif ()
- 
- install(TARGETS kdeinit_klipper ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-@@ -93,7 +93,7 @@ if (X11_FOUND)
-   target_link_libraries(plasma_engine_clipboard XCB::XCB Qt5::X11Extras)
- endif()
- if (HAVE_PRISON)
--  target_link_libraries(plasma_engine_clipboard KF5::Prison)
-+  target_link_libraries(plasma_engine_clipboard ${PRISON_LIBRARIES})
- endif ()
- install(TARGETS plasma_engine_clipboard DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/dataengine)
- install(FILES plasma-dataengine-clipboard.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
-diff -up plasma-workspace-5.4.2/klipper/klipper.cpp.prison-qt5 plasma-workspace-5.4.2/klipper/klipper.cpp
---- plasma-workspace-5.4.2/klipper/klipper.cpp.prison-qt5	2015-10-01 04:56:51.000000000 -0500
-+++ plasma-workspace-5.4.2/klipper/klipper.cpp	2015-10-20 12:28:13.429524828 -0500
-@@ -50,8 +50,8 @@
- #include "klipperpopup.h"
- 
- #ifdef HAVE_PRISON
--#include <prison/DataMatrixBarcode>
--#include <prison/QRCodeBarcode>
-+#include <prison-qt5/DataMatrixBarcode>
-+#include <prison-qt5/QRCodeBarcode>
- #endif
- 
- #include <config-X11.h>

plasma-workspace.spec

@@ -4,14 +4,10 @@
 
 %global kf5_version 5.13.0
 
-%if 0%{?fedora} > 23
-%global prison 1
-%endif
-
 Name:           plasma-workspace
 Summary:        Plasma workspace, applications and applets
 Version:        5.5.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 License:        GPLv2+
 URL:            https://projects.kde.org/plasma-workspace
@@ -37,7 +33,6 @@ Patch10:        plasma-workspace-5.3.0-konsole-in-contextmenu.patch
 Patch11:        plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch
 # remove stuff we don't want or need, plus a minor bit of customization --rex
 Patch12:        startkde.patch
-Patch13:        plasma-workspace-5.4.2-prison-qt5.patch
 Patch14:        plasma-workspace-5.5.0-plasmawayland_desktop.patch
 
 ## upstreamable Patches
@@ -362,9 +357,6 @@ sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfee
   shell/packageplugins/lookandfeel/lookandfeel.cpp
 %endif
 %patch12 -p1 -b .startkde
-%if 0%{?prison}
-%patch13 -p1 -b .prison-qt5
-%endif
 %patch14 -p1 -b .plasmawayland
 
 
@@ -578,6 +570,9 @@ fi
 
 
 %changelog
+* Sun Jan 10 2016 Rex Dieter <rdieter@fedoraproject.org> 5.5.3-3
+- drop hacked klipper/prison support (until we have kf5-prison available properly)
+
 * Sat Jan 09 2016 Rex Dieter <rdieter@fedoraproject.org> 5.5.3-2
 - pull in upstream fixes (notifications,xembedsniproxy)