[marble] fix designer plugin path (kde#327690), reenable designer plugin

[Kevin Kofler]

commit 7eb04c7793e11733a83774702d7b0cf60e9d826d
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sun Nov 17 01:12:17 2013 +0100

    fix designer plugin path (kde#327690), reenable designer plugin
    
    * Sun Nov 17 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:4.11.90-2
    - fix designer plugin path (kde#327690), reenable designer plugin

 0001-Reuse-MARBLE_PLUGIN_INSTALL_PATH.patch |   36 +++++++++++++++++++++++++++
 marble.spec                                 |   11 ++++++-
 2 files changed, 45 insertions(+), 2 deletions(-)
---
diff --git a/0001-Reuse-MARBLE_PLUGIN_INSTALL_PATH.patch b/0001-Reuse-MARBLE_PLUGIN_INSTALL_PATH.patch
new file mode 100644
index 0000000..c4b3a6a
--- /dev/null
+++ b/0001-Reuse-MARBLE_PLUGIN_INSTALL_PATH.patch
@@ -0,0 +1,36 @@
+From 2773f06af5f57563d5c5c8e0ea8e74d56c8300bb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dennis=20Nienh=C3=BCser?= <earthwings at gentoo.org>
+Date: Sun, 20 Oct 2013 18:50:44 +0200
+Subject: [PATCH] Reuse MARBLE_PLUGIN_INSTALL_PATH.
+
+Do not handle KDE vs Qt build specially wrt plugin install path. Also
+enables non-system installation for QTONLY=OFF width designer plugins.
+---
+ MarbleMacros.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/MarbleMacros.cmake b/MarbleMacros.cmake
+index 694c4a7..02e1ada 100644
+--- a/MarbleMacros.cmake
++++ b/MarbleMacros.cmake
+@@ -88,7 +88,7 @@ if( QTONLY )
+                                            ${QT_QTMAIN_LIBRARY}
+                                            ${${_target_name}_LIBS}
+                                            marblewidget )
+-    install( TARGETS ${_target_name} DESTINATION ${QT_PLUGINS_DIR}/designer )
++    install( TARGETS ${_target_name} DESTINATION ${MARBLE_PLUGIN_INSTALL_PATH}/designer )
+ else( QTONLY )
+     kde4_add_plugin( ${_target_name} ${_src} )
+     target_link_libraries( ${_target_name} ${QT_QTCORE_LIBRARY}
+@@ -103,7 +103,7 @@ else( QTONLY )
+                                            ${QT_QTMAIN_LIBRARY}
+                                            ${${_target_name}_LIBS}
+                                            marblewidget )
+-    install( TARGETS ${_target_name} DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
++    install( TARGETS ${_target_name} DESTINATION ${MARBLE_PLUGIN_INSTALL_PATH}/plugins/designer )
+ endif( QTONLY )
+ 
+ set_target_properties( ${_target_name} PROPERTIES 
+-- 
+1.8.1.4
+
diff --git a/marble.spec b/marble.spec
index e9f53cb..b0ac4cc 100644
--- a/marble.spec
+++ b/marble.spec
@@ -1,13 +1,13 @@
 ## enable python bindings or not
 #global python 1
 ## enable designer plugin
-#global designer 1
+%global designer 1
 
 Name:    marble
 Summary: Virtual globe and world atlas 
 Epoch:   1
 Version: 4.11.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPLv2+
 #URL:    https://projects.kde.org/projects/kde/kdeedu/marble
@@ -23,6 +23,9 @@ Source0:  http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.ta
 # find libqextserialport-1.2.so
 # TODO: upstreamable? Or do we want to fix qextserialport-devel instead?
 Patch0: marble-4.11.90-qextserialport.patch
+# REVERT upstream patch which changes the install path for Qt Designer plugins
+# fixes https://bugs.kde.org/show_bug.cgi?id=327690
+Patch1: 0001-Reuse-MARBLE_PLUGIN_INSTALL_PATH.patch
 
 ## upstreamable patches
 
@@ -111,6 +114,7 @@ Requires: pykde4 >= %{version}
 %setup -q
 
 %patch0 -p1 -b .qextserialport
+%patch1 -R -p1 -b .revert-designer-plugin-path
 
 
 %build
@@ -207,6 +211,9 @@ fi
 
 
 %changelog
+* Sun Nov 17 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:4.11.90-2
+- fix designer plugin path (kde#327690), reenable designer plugin
+
 * Sat Nov 16 2013 Rex Dieter <rdieter at fedoraproject.org> - 1:4.11.90-1
 - 4.11.90, disable broken python bindings, designer plugin