- up to 4.5.0

diff --git a/cura.spec b/cura.spec
index 89160198154d5c41ed021068f54fa44135f84b13..b318878688f86bffdef54f26e60e132551f4505a 100644 (file)
--- a/cura.spec
+++ b/cura.spec
@@ -1,7 +1,7 @@
 Summary:       3D printer control software
 Name:          cura
-Version:       3.5.1
-Release:       3
+Version:       4.5.0
+Release:       1
 Epoch:         1
 Group:         Applications/Engineering
 # Code is AGPLv3
@@ -10,9 +10,9 @@ Group:                Applications/Engineering
 # TweakAtZ.py is CC-BY-SA
 License:       AGPLv3 and CC-BY-SA
 Source0:       https://github.com/Ultimaker/Cura/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: a8b1de1bb8cfc043aa1d742f2cc78911
+# Source0-md5: b02b95a4669110cff62f96e1bb00b1b5
 Source1:       https://github.com/Ultimaker/fdm_materials/archive/%{version}/fdm_materials-%{version}.tar.gz
-# Source1-md5: 7d0bcfe67173f8fd616ac5ca55eb815b
+# Source1-md5: 449b2301efb4a4616c5c610bae173d0d
 Patch0:                plugins-path.patch
 URL:           https://ultimaker.com/en/products/cura-software
 BuildRequires: cmake
@@ -57,12 +57,9 @@ for bad_lang in de_DE es_ES fi_FI fr_FR it_IT ja_JP ko_KR nl_NL pl_PL pt_PT ru_R
        %{__mv} "resources/i18n/$bad_lang" "resources/i18n/$lang"
 done
 
-# The setup.py is only useful for py2exe, remove it, so noone is tempted to use it
-%{__rm} setup.py
-
 # Upstream installs to lib/python3/dist-packages
 # We want to install to %{py3_sitescriptdir}
-%{__sed} -i 's|lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.*/.*-packages|%(echo %{py3_sitescriptdir} | sed -e s@%{_prefix}/@@)|g' CMakeLists.txt
+%{__sed} -i 's|lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.*/.*-packages|%(echo %{py3_sitescriptdir} | sed -e s@%{_prefix}/@@)|g' CMakeLists.txt
 
 # Wrong shebang
 %{__sed} -i '1s=^#!%{_bindir}/\(python\|env python\)3*=#!%{__python3}=' cura_app.py

diff --git a/plugins-path.patch b/plugins-path.patch
index ea0fa3f1517cd898e6b15d2db86610c9f5ee5620..26383b83a9f90d8608a0ad7cdff29fecc780cc21 100644 (file)
--- a/plugins-path.patch
+++ b/plugins-path.patch
@@ -8,14 +8,14 @@
          if not hasattr(sys, "frozen"):
              self._plugin_registry.addPluginLocation(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "plugins"))
              self._plugin_registry.loadPlugin("ConsoleLogger")
---- Cura-2.5.0/CMakeLists.txt~ 2017-05-14 00:42:31.000000000 +0200
-+++ Cura-2.5.0/CMakeLists.txt  2017-05-14 11:18:14.335558709 +0200
-@@ -36,7 +36,7 @@
- install(DIRECTORY resources
-         DESTINATION ${CMAKE_INSTALL_DATADIR}/cura)
- install(DIRECTORY plugins
--        DESTINATION lib${LIB_SUFFIX}/cura)
-+        DESTINATION ${CMAKE_INSTALL_DATADIR}/cura)
- if(NOT APPLE AND NOT WIN32)
-     install(FILES cura_app.py
-             DESTINATION ${CMAKE_INSTALL_BINDIR}
+--- Cura-2.5.0/cmake/CuraPluginInstall.cmake~  2018-11-04 14:15:43.000000000 +0100
++++ Cura-2.5.0/cmake/CuraPluginInstall.cmake   2018-11-04 14:16:18.346958842 +0100
+@@ -84,6 +84,6 @@
+         message(STATUS "[+] PLUGIN TO INSTALL: ${_rel_plugin_dir}")
+         get_filename_component(_rel_plugin_parent_dir ${_rel_plugin_dir} DIRECTORY)
+         install(DIRECTORY ${_rel_plugin_dir}
+-                DESTINATION lib${LIB_SUFFIX}/cura/${_rel_plugin_parent_dir}
++                DESTINATION ${CMAKE_INSTALL_DATADIR}/cura/${_rel_plugin_parent_dir}
+                 PATTERN "__pycache__" EXCLUDE
+                 PATTERN "*.qmlc" EXCLUDE
+                 )