From 113106aa7192c7ac1ac0aa084cfda0ddb0daa9c3 Mon Sep 17 00:00:00 2001
From: Gabriel Feron <feron.gabriel@gmail.com>
Date: Sat, 26 Jan 2019 12:59:58 +0100
Subject: [PATCH] Update to 3.6.0

Signed-off-by: Gabriel Feron <feron.gabriel@gmail.com>
---
 .gitignore                            |  1 +
 python-uranium-fix-wrong-import.patch | 60 +++++++++++++++++++++++++++
 python-uranium.spec                   |  7 +++-
 sources                               |  2 +-
 4 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 python-uranium-fix-wrong-import.patch

diff --git a/.gitignore b/.gitignore
index 867246b..4eb6529 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /Uranium-3.3.0.tar.gz
 /Uranium-3.4.1.tar.gz
 /Uranium-3.5.1.tar.gz
+/Uranium-3.6.0.tar.gz
diff --git a/python-uranium-fix-wrong-import.patch b/python-uranium-fix-wrong-import.patch
new file mode 100644
index 0000000..099b758
--- /dev/null
+++ b/python-uranium-fix-wrong-import.patch
@@ -0,0 +1,60 @@
+diff --git a/tests/0001-Fix-wrong-import.patch b/tests/0001-Fix-wrong-import.patch
+new file mode 100644
+index 00000000..7a2f1fdc
+--- /dev/null
++++ b/tests/0001-Fix-wrong-import.patch
+@@ -0,0 +1,25 @@
++From 4b02dee5b9ab4d73b3e710605151dc2c2cdbdc32 Mon Sep 17 00:00:00 2001
++From: Gabriel Feron <feron.gabriel@gmail.com>
++Date: Sat, 26 Jan 2019 12:30:14 +0100
++Subject: [PATCH] Fix wrong import
++
++---
++ tests/Settings/TestContainerRegistry.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/tests/Settings/TestContainerRegistry.py b/tests/Settings/TestContainerRegistry.py
++index 9b87b16f..4b241fdf 100644
++--- a/tests/Settings/TestContainerRegistry.py
+++++ b/tests/Settings/TestContainerRegistry.py
++@@ -9,7 +9,7 @@ from UM.Resources import Resources
++ from UM.Settings.DefinitionContainer import DefinitionContainer
++ from UM.Settings.InstanceContainer import InstanceContainer
++ from UM.Settings.ContainerStack import ContainerStack
++-from tests.Settings.MockContainer import MockContainer
+++from MockContainer import MockContainer
++
++ Resources.addSearchPath(os.path.dirname(os.path.abspath(__file__)))
++
++--
++2.20.1
++
+diff --git a/tests/Settings/TestContainerRegistry.py b/tests/Settings/TestContainerRegistry.py
+index 9b87b16f..4b241fdf 100644
+--- a/tests/Settings/TestContainerRegistry.py
++++ b/tests/Settings/TestContainerRegistry.py
+@@ -9,7 +9,7 @@ from UM.Resources import Resources
+ from UM.Settings.DefinitionContainer import DefinitionContainer
+ from UM.Settings.InstanceContainer import InstanceContainer
+ from UM.Settings.ContainerStack import ContainerStack
+-from tests.Settings.MockContainer import MockContainer
++from MockContainer import MockContainer
+
+ Resources.addSearchPath(os.path.dirname(os.path.abspath(__file__)))
+
+diff --git a/tests/Settings/TestContainerStack.py b/tests/Settings/TestContainerStack.py
+index 966800a2..bc7db098 100644
+--- a/tests/Settings/TestContainerStack.py
++++ b/tests/Settings/TestContainerStack.py
+@@ -14,7 +14,7 @@ from UM.Settings.ContainerStack import InvalidContainerStackError
+ from UM.Settings.DefinitionContainer import DefinitionContainer
+ from UM.Settings.InstanceContainer import InstanceContainer
+ from UM.Resources import Resources
+-from tests.Settings.MockContainer import MockContainer
++from MockContainer import MockContainer
+
+ Resources.addSearchPath(os.path.dirname(os.path.abspath(__file__)))
+
+--
+2.20.1
+
diff --git a/python-uranium.spec b/python-uranium.spec
index d3f6f53..db81e3b 100644
--- a/python-uranium.spec
+++ b/python-uranium.spec
@@ -1,11 +1,13 @@
 Name:           python-uranium
-Version:        3.5.1
+Version:        3.6.0
 Release:        1%{?dist}
 Summary:        A Python framework for building desktop applications
 License:        LGPLv3+
 URL:            https://github.com/Ultimaker/Uranium
 Source0:        %{url}/archive/%{version}.tar.gz#/Uranium-%{version}.tar.gz
 
+Patch0:         %{name}-fix-wrong-import.patch
+
 BuildRequires:  python3-devel
 BuildRequires:  python3-pip
 BuildRequires:  /usr/bin/doxygen
@@ -104,6 +106,9 @@ popd
 
 
 %changelog
+* Sat Jan 26 2019 Gabriel Féron <feron.gabriel@gmail.com> - 3.6.0-1
+- Update to 3.6.0
+
 * Mon Nov 12 2018 Miro Hrončok <mhroncok@redhat.com> - 3.5.1-1
 - Update to 3.5.1 (#1644323)
 
diff --git a/sources b/sources
index 7d335e3..469f3f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Uranium-3.5.1.tar.gz) = 2924721f5308eb8f27826316a705a12f0768889a4a6c9de431d6827a98036b664497c12ef1dd42e47f67e566fe169d7b5941b62426952c9bec1797933bfc62ce
+SHA512 (Uranium-3.6.0.tar.gz) = 41779e9cf76dff8f74252f668d1cf909c93f4f1416f75d2ed263f89fcfccfbcebce5580d8202d8d1697491139db448bbfa76e2dbc761dd24cb98030b3241e80d