[CuraEngine] Updated to 14.12.1
Miro Hrončok
churchyard at fedoraproject.org
Mon Dec 29 12:07:36 UTC 2014
commit 53482a1da2d23bd81c33351d9239c8c2c74dac07
Author: Miro Hrončok <miro at hroncok.cz>
Date: Mon Dec 29 13:07:35 2014 +0100
Updated to 14.12.1
.gitignore | 1 +
CuraEngine.spec | 17 ++++++++++-------
sources | 2 +-
3 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c9e311a..b2c3fca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/13.11.2.tar.gz
/14.01.tar.gz
/14.03.tar.gz
+/14.12.1.tar.gz
diff --git a/CuraEngine.spec b/CuraEngine.spec
index 4235d8c..ed904d5 100644
--- a/CuraEngine.spec
+++ b/CuraEngine.spec
@@ -1,6 +1,6 @@
Name: CuraEngine
-Version: 14.03
-Release: 3%{?dist}
+Version: 14.12.1
+Release: 1%{?dist}
Summary: Engine for processing 3D models into G-code instructions for 3D printers
License: AGPLv3
URL: https://github.com/Ultimaker/%{name}
@@ -21,19 +21,19 @@ application look at cura with is the graphical frontend for %{name}.
# bundled clipper
rm -rf clipper
-sed -i 's|#include "../clipper/clipper.hpp"|#include <polyclipping/clipper.hpp>|' utils/*.h
-sed -i 's|$(CXX)|$(CXX) $(LIBS)|g' Makefile
-sed -i 's| clipper/clipper.cpp||g' Makefile
+sed -i 's|#include <clipper/clipper.hpp>|#include <polyclipping/clipper.hpp>|' src/utils/*.h
+sed -i 's|-lclipper|-lpolyclipping|g' Makefile
+sed -i 's| $(BUILD_DIR)/libclipper.a||g' Makefile
# allow redefinition of CFLAGS and do not build it static
sed -i 's|CFLAGS +=|CFLAGS?=|' Makefile
sed -i 's|--static||g' Makefile
%build
-LIBS="-lpolyclipping" CFLAGS="-I. -c %{optflags} -fomit-frame-pointer" make %{?_smp_mflags}
+CFLAGS="-I. -Ilibs -c %{optflags} -std=c++11 -fomit-frame-pointer" make %{?_smp_mflags}
%install
-install -Dpm0755 %{name} %{buildroot}/%{_bindir}/%{name}
+install -Dpm0755 build/%{name} %{buildroot}/%{_bindir}/%{name}
%check
make test
@@ -43,6 +43,9 @@ make test
%{_bindir}/%{name}
%changelog
+* Mon Dec 29 2014 Miro Hrončok <mhroncok at redhat.com> - 14.12.1-1
+- Update to 14.12.1
+
* Thu Oct 23 2014 Miro Hrončok <mhroncok at redhat.com> - 14.03-3
- Rebuilt for new polyclipping
diff --git a/sources b/sources
index 5812a54..f8ae6ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d163c93be40a2051d7ee5417079d473c 14.03.tar.gz
+4e975b070d575eba826c3d46f1d9f718 14.12.1.tar.gz
More information about the scm-commits
mailing list