New version 13.11.2
This commit is contained in:
parent
280b908faf
commit
d99a63b5eb
3 changed files with 14 additions and 17 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1 +1,2 @@
|
|||
/13.06.3.tar.gz
|
||||
/13.11.2.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,14 +1,10 @@
|
|||
Name: CuraEngine
|
||||
Version: 13.06.3
|
||||
Release: 4%{?dist}
|
||||
Version: 13.11.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Engine for processing 3D models into G-code instructions for 3D printers
|
||||
License: AGPLv3
|
||||
URL: https://github.com/Ultimaker/%{name}
|
||||
Source0: %{url}/archive/%{version}.tar.gz
|
||||
%if 0%{?fedora} > 18
|
||||
# Patch that add compatibility layer for clipper/polyclipping >= 5.1.x
|
||||
Patch0: %{name}-clipper51x.patch
|
||||
%endif
|
||||
BuildRequires: polyclipping-devel
|
||||
|
||||
%description
|
||||
|
|
@ -20,21 +16,16 @@ application look at cura with is the graphical frontend for %{name}.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%if 0%{?fedora} > 18
|
||||
%patch0 -p1
|
||||
%endif
|
||||
|
||||
# bundled clipper
|
||||
rm -rf clipper
|
||||
sed -i 's|#include "clipper/clipper.hpp"|#include <polyclipping/clipper.hpp>|' utils/intpoint.h
|
||||
sed -i 's|$(CC)|$(CC) $(LIBS)|g' Makefile
|
||||
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
|
||||
|
||||
# allow CFLAGS
|
||||
sed -i 's|CFLAGS=|CFLAGS?=|' Makefile
|
||||
|
||||
# update version in main.spp
|
||||
sed -i 's|#define VERSION "1.0"|#define VERSION "%{version}"|' main.cpp
|
||||
# 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}
|
||||
|
|
@ -53,6 +44,11 @@ done
|
|||
%{_bindir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Sat Dec 14 2013 Miro Hrončok <mhroncok@redhat.com> - 13.11.2-1
|
||||
- New version 13.11.2
|
||||
- Makefile seding changed to reflect changes
|
||||
- Clipper usage no longer need patching
|
||||
|
||||
* Fri Aug 02 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 13.06.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
13ffecad8dc85f593ec014c249203fb5 13.06.3.tar.gz
|
||||
322e5c0df0c5be58c4459dae63d7d9f8 13.11.2.tar.gz
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue