- fix plugin search path

- rel 2

diff --git a/plugins-install.patch b/plugins-install.patch
deleted file mode 100644 (file)
index 924aa3f..0000000
--- a/plugins-install.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Uranium-2.5.0/CMakeLists.txt~      2017-05-13 23:51:30.000000000 +0200
-+++ Uranium-2.5.0/CMakeLists.txt       2017-05-13 23:56:38.423247507 +0200
-@@ -64,6 +64,6 @@
- install(FILES ${CMAKE_SOURCE_DIR}/cmake/UraniumTranslationTools.cmake
-         DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/ )
- install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium)
--install(DIRECTORY plugins DESTINATION lib/uranium)
-+install(DIRECTORY plugins DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium)
- 
- include(CPackConfig.cmake)

diff --git a/plugins-path.patch b/plugins-path.patch
new file mode 100644 (file)
index 0000000..4603c0e
--- /dev/null
+++ b/plugins-path.patch
@@ -0,0 +1,21 @@
+--- Uranium-2.5.0/CMakeLists.txt~      2017-05-13 23:51:30.000000000 +0200
++++ Uranium-2.5.0/CMakeLists.txt       2017-05-13 23:56:38.423247507 +0200
+@@ -64,6 +64,6 @@
+ install(FILES ${CMAKE_SOURCE_DIR}/cmake/UraniumTranslationTools.cmake
+         DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules/ )
+ install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium)
+-install(DIRECTORY plugins DESTINATION lib/uranium)
++install(DIRECTORY plugins DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium)
+ 
+ include(CPackConfig.cmake)
+--- Uranium-2.5.0/UM/Application.py~   2017-04-13 15:03:28.000000000 +0200
++++ Uranium-2.5.0/UM/Application.py    2017-05-14 11:25:56.345442852 +0200
+@@ -95,7 +95,7 @@
+ 
+         self._plugin_registry = PluginRegistry.getInstance()
+ 
+-        self._plugin_registry.addPluginLocation(os.path.join(Application.getInstallPrefix(), "lib", "uranium"))
++        self._plugin_registry.addPluginLocation(os.path.join(Application.getInstallPrefix(), "share", "uranium"))
+         self._plugin_registry.addPluginLocation(os.path.join(os.path.dirname(sys.executable), "plugins"))
+         self._plugin_registry.addPluginLocation(os.path.join(Application.getInstallPrefix(), "Resources", "uranium", "plugins"))
+         self._plugin_registry.addPluginLocation(os.path.join(Application.getInstallPrefix(), "Resources", self.getApplicationName(), "plugins"))

diff --git a/python3-Uranium.spec b/python3-Uranium.spec
index 14d9e52155a6fd8e1c46361af655254ab3fb16e1..8c1cc739d086638ea3d07cbfb5774e84e4afa628 100644 (file)
--- a/python3-Uranium.spec
+++ b/python3-Uranium.spec
@@ -2,13 +2,13 @@
 Summary:       A Python framework for building desktop applications
 Name:          python3-%{module}
 Version:       2.5.0
-Release:       1
+Release:       2
 License:       AGPLv3+
 Group:         Libraries/Python
 URL:           https://github.com/Ultimaker/Uranium
 Source0:       https://github.com/Ultimaker/Uranium/archive/%{version}/%{module}-%{version}.tar.gz
 # Source0-md5: 28586f24c35d99e5730692defd728b3e
-Patch0:                plugins-install.patch
+Patch0:                plugins-path.patch
 BuildRequires: cmake
 BuildRequires: doxygen
 BuildRequires: gettext-tools