- restore plugins-path patch and move plugins back to datadir

diff --git a/plugins-path.patch b/plugins-path.patch
new file mode 100644 (file)
index 0000000..6a30d65
--- /dev/null
+++ b/plugins-path.patch
@@ -0,0 +1,20 @@
+--- Uranium-3.5.1/CMakeLists.txt~      2018-11-04 14:15:43.000000000 +0100
++++ Uranium-3.5.1/CMakeLists.txt       2018-11-04 14:16:18.346958842 +0100
+@@ -55,6 +55,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${LIB_SUFFIX}/uranium)
++install(DIRECTORY plugins DESTINATION ${CMAKE_INSTALL_DATADIR}/uranium)
+ 
+ include(CPackConfig.cmake)
+--- Uranium-3.5.1/UM/Application.py~   2018-10-15 11:44:28.000000000 +0200
++++ Uranium-3.5.1/UM/Application.py    2018-11-04 14:30:40.963992502 +0100
+@@ -165,6 +165,7 @@
+         self._plugin_registry = PluginRegistry(self)  #type: PluginRegistry
+ 
+         self._plugin_registry.addPluginLocation(os.path.join(self._app_install_dir, UraniumLibraryDir, "uranium"))
++        self._plugin_registry.addPluginLocation(os.path.join(self._app_install_dir, "share", "uranium"))
+         self._plugin_registry.addPluginLocation(os.path.join(os.path.dirname(sys.executable), "plugins"))
+         self._plugin_registry.addPluginLocation(os.path.join(self._app_install_dir, "Resources", "uranium", "plugins"))
+         self._plugin_registry.addPluginLocation(os.path.join(self._app_install_dir, "Resources", self._app_name, "plugins"))

diff --git a/python3-Uranium.spec b/python3-Uranium.spec
index a70acbd39c8c33a7af15959980ca0f08c11d17e9..1527fc454c607cacf59cc597003cc4af578d44ef 100644 (file)
--- a/python3-Uranium.spec
+++ b/python3-Uranium.spec
@@ -2,13 +2,14 @@
 Summary:       A Python framework for building desktop applications
 Name:          python3-%{module}
 Version:       3.5.1
-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: c67cc1f04d5a78595eefa55a02629c47
 Patch0:                remove-mypy-test.patch
+Patch1:                plugins-path.patch
 BuildRequires: cmake
 BuildRequires: doxygen
 BuildRequires: gettext-tools
@@ -43,6 +44,7 @@ related applications.
 %prep
 %setup -q -n %{module}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 for bad_lang in de_DE es_ES fi_FI fr_FR hu_HU it_IT ja_JP ko_KR nl_NL pl_PL pt_PT ru_RU tr_TR ; do
        lang="$(echo $bad_lang | sed 's/_.*//')"
@@ -93,7 +95,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README.md
 %{py3_sitescriptdir}/UM
-%{_libdir}/uranium
 %{_datadir}/uranium
 %{_datadir}/cmake