diff --git a/.gitignore b/.gitignore index 7e8ee2f..efbeea0 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /CuraEngine-3.3.0.tar.gz /CuraEngine-3.4.1.tar.gz /e6afb9cbae4064da8c3e69af3ff5c4629579c1d2.tar.gz +/CuraEngine-3.5.1.tar.gz diff --git a/CuraEngine-3.4.1-no-resource-dir.patch b/CuraEngine-3.4.1-no-resource-dir.patch deleted file mode 100644 index 5710f17..0000000 --- a/CuraEngine-3.4.1-no-resource-dir.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5aad55bf67e52ce5bdb27a3925af8a4cab441b38 Mon Sep 17 00:00:00 2001 -From: Ghostkeeper -Date: Mon, 18 Jun 2018 15:39:01 +0200 -Subject: [PATCH] Remove outdated copy of command_line_settings.json - -This entire directory doesn't exist. ---- - CMakeLists.txt | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c579388f..4c55e6f39 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -251,11 +251,6 @@ if (BUILD_TESTS) - endforeach() - endif() - -- --add_custom_command(TARGET CuraEngine POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy_directory -- ${CMAKE_SOURCE_DIR}/resources $) -- - # Installing CuraEngine. - include(GNUInstallDirs) - install(TARGETS CuraEngine DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/CuraEngine.spec b/CuraEngine.spec index 6ddfe02..9d785a4 100644 --- a/CuraEngine.spec +++ b/CuraEngine.spec @@ -1,7 +1,7 @@ Name: CuraEngine -Epoch: 1 -Version: 3.4.1 -Release: 1%{?dist} +Epoch: 0 +Version: 3.5.1 +Release: 2%{?dist} Summary: Engine for processing 3D models into G-code instructions for 3D printers License: AGPLv3+ URL: https://github.com/Ultimaker/%{name} @@ -20,15 +20,11 @@ BuildRequires: polyclipping-devel >= 6.1.2 BuildRequires: protobuf-devel BuildRequires: rapidjson-devel BuildRequires: cmake -BuildRequires: git +BuildRequires: git-core Patch0: %{name}-rpath.patch Patch1: %{name}-static-libstdcpp.patch -# A weird part of cmake stuff that does not work at all, not present in upstream master -# https://github.com/Ultimaker/CuraEngine/commit/5aad55bf67e52ce5bdb27a3925af8a4cab441b38 -Patch2: %{name}-3.4.1-no-resource-dir.patch - %description %{name} is a C++ console application for 3D printing G-code generation. It has been made as a better and faster alternative to the old Skeinforge engine. @@ -39,6 +35,7 @@ application look at cura with is the graphical frontend for %{name}. %prep %autosetup -p1 -S git tar -xf %{SOURCE1} +mv stb-%{stb_commit} stb # bundled libraries rm -rf libs @@ -64,6 +61,9 @@ make install DESTDIR=%{buildroot} %{_bindir}/%{name} %changelog +* Mon Nov 12 2018 Miro Hrončok - 0:3.5.1-2 +- Update to 3.5.1 (#1644323) + * Tue Aug 28 2018 Miro Hrončok - 1:3.4.1-1 - Update to 3.4.1 diff --git a/sources b/sources index 6e08fd9..328f98b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (CuraEngine-3.4.1.tar.gz) = 51c75e299ef7728101a4c61aa033c9b07112b0955d2ec72ba6173684513ed3c503a744fab487efe2c19da01eb97bd1297b5b8724b4f767639c8e82eefcdd01be +SHA512 (CuraEngine-3.5.1.tar.gz) = 99182c5f43b7b3e5f8276a839406d00930bf01db1a640f23d8d9663f67d17085ccaf6de156c552815da9ec07a9b462300919c07a04bc4d0f08e0f3c9e70c6c4b SHA512 (e6afb9cbae4064da8c3e69af3ff5c4629579c1d2.tar.gz) = 232ef301d4d6c82c7c5f0e4234b9160cc815f3b6bcc35d341cdf8738646f2f0887ee9838680699f4c9f4274b1390036b2c4fb3ebc2d663af8ff888114dc9f04b