From fafd3e47d96200c4aa6cd72e410e4c1467d0b4172af76508a7036a84c5b64f7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian.schroeter@suse.com>
Date: Wed, 11 Nov 2020 08:01:10 +0000
Subject: [PATCH] Accepting request 847580 from
 home:StefanBruens:branches:science

- Update to version 4.8.0
  Release notes:
  * https://github.com/Ultimaker/Cura/releases/tag/4.8
- Use system RapidJSON and polyclipping when available

OBS-URL: https://build.opensuse.org/request/show/847580
OBS-URL: https://build.opensuse.org/package/show/science/cura-engine?expand=0&rev=51
---
 CuraEngine-4.7.1.obscpio |  3 ---
 CuraEngine.obsinfo       |  5 -----
 _service                 | 15 ---------------
 cura-engine-4.8.0.tar.gz |  3 +++
 cura-engine.changes      |  8 ++++++++
 cura-engine.spec         | 21 ++++++++++++++-------
 6 files changed, 25 insertions(+), 30 deletions(-)
 delete mode 100644 CuraEngine-4.7.1.obscpio
 delete mode 100644 CuraEngine.obsinfo
 delete mode 100644 _service
 create mode 100644 cura-engine-4.8.0.tar.gz

diff --git a/CuraEngine-4.7.1.obscpio b/CuraEngine-4.7.1.obscpio
deleted file mode 100644
index 03dc482..0000000
--- a/CuraEngine-4.7.1.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:619d3f0f77a54b5a20391a1ae6b948f1d799f9833c8ff276bae7e9315075b1f9
-size 5429773
diff --git a/CuraEngine.obsinfo b/CuraEngine.obsinfo
deleted file mode 100644
index 26699ca..0000000
--- a/CuraEngine.obsinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-name: CuraEngine
-version: 4.7.1
-mtime: 1597401266
-commit: fadb5d6b43c3793eaed5b4e6b0337b08975fa9d5
-
diff --git a/_service b/_service
deleted file mode 100644
index 0090746..0000000
--- a/_service
+++ /dev/null
@@ -1,15 +0,0 @@
-<services>
-  <service name="obs_scm" mode="disabled">
-    <param name="url">https://github.com/Ultimaker/CuraEngine.git</param>
-    <param name="scm">git</param>
-    <param name="revision">4.7.1</param>
-    <param name="version">4.7.1</param>
-  </service>
-  <service mode="disabled" name="set_version" />
-
-  <service mode="buildtime" name="tar" />
-  <service mode="buildtime" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">xz</param>
-  </service>
-</services>
diff --git a/cura-engine-4.8.0.tar.gz b/cura-engine-4.8.0.tar.gz
new file mode 100644
index 0000000..452553e
--- /dev/null
+++ b/cura-engine-4.8.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a2a06700b553a5240a3025b74a43353a97e5be9b1f741eb6f01e67b2a6a222d
+size 1690006
diff --git a/cura-engine.changes b/cura-engine.changes
index a9fd381..7d672ed 100644
--- a/cura-engine.changes
+++ b/cura-engine.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Nov 10 18:19:18 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Update to version 4.8.0
+  Release notes:
+  * https://github.com/Ultimaker/Cura/releases/tag/4.8
+- Use system RapidJSON and polyclipping when available
+
 -------------------------------------------------------------------
 Tue Sep 15 21:26:14 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 
diff --git a/cura-engine.spec b/cura-engine.spec
index bf68276..ab9a7de 100644
--- a/cura-engine.spec
+++ b/cura-engine.spec
@@ -17,13 +17,14 @@
 
 
 Name:           cura-engine
-Version:        4.7.1
+%define sversion 4.8
+Version:        4.8.0
 Release:        0
 Summary:        3D printer control software
 License:        AGPL-3.0-only
 Group:          Hardware/Printing
 URL:            https://github.com/Ultimaker/CuraEngine
-Source0:        CuraEngine-%{version}.tar.xz
+Source0:        https://github.com/Ultimaker/CuraEngine/archive/%{sversion}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        CuraEngine.1
 # X-OPENSUSE-PATCH fix-build.patch follow openSUSE policies
 Patch1:         fix-build.patch
@@ -31,8 +32,12 @@ BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  gmock
 BuildRequires:  gtest
-BuildRequires:  libArcus-devel
+BuildRequires:  libArcus-devel >= %{version}
 BuildRequires:  stb-devel
+%if 0%{suse_version} >= 1550
+BuildRequires:  cmake(RapidJSON)
+BuildRequires:  pkgconfig(polyclipping)
+%endif
 # No 32bit support anymore
 ExcludeArch:    %ix86 %arm s390
 
@@ -42,7 +47,7 @@ instruction for Ultimaker and other GCode-based 3D printers.
 It is part of the larger project called "Cura".
 
 %prep
-%setup -q -n CuraEngine-%version
+%setup -q -n CuraEngine-%sversion
 %patch1 -p1
 # the test is hardcoding the version number
 sed -i -e 's,"master","%{version}",' tests/GCodeExportTest.cpp
@@ -52,12 +57,14 @@ sed -i -e 's,"master","%{version}",' tests/GCodeExportTest.cpp
 %cmake -DCURA_ENGINE_VERSION=%version \
        -DCMAKE_POSITION_INDEPENDENT_CODE="true" \
        -DBUILD_SHARED_LIBS="false" \
+%if 0%{suse_version} >= 1550
+       -DUSE_SYSTEM_LIBS=ON \
+%endif
        -DBUILD_TESTS=ON
-%make_jobs
+%cmake_build
 
 %install
-cd build
-%make_install
+%cmake_install
 
 install -Dm0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/CuraEngine.1