From 9b67ca3cc2f040227678eabd6141e7c6edc73ad1f7941dea5fc837f0a397f8bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 9 Dec 2017 09:40:25 +0000 Subject: [PATCH] Accepting request 555308 from home:StefanBruens:3dPrinting Fix license, cleanup spec OBS-URL: https://build.opensuse.org/request/show/555308 OBS-URL: https://build.opensuse.org/package/show/science/cura-engine?expand=0&rev=11 --- CuraEngine-3.0.3.obscpio | 4 ++-- cura-engine.changes | 11 +++++++++++ cura-engine.spec | 13 ++++++------- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/CuraEngine-3.0.3.obscpio b/CuraEngine-3.0.3.obscpio index 30dc1d5..17fb4e3 100644 --- a/CuraEngine-3.0.3.obscpio +++ b/CuraEngine-3.0.3.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:240e410aa3347713e7d5d291028e48e118fa0b7253c19fdaac66ff45dfbdbfd9 -size 2763789 +oid sha256:f55a7f1021d89091ed242e8334e91155e10da062f156230d7166ad78e6f9915e +size 2763788 diff --git a/cura-engine.changes b/cura-engine.changes index fa1d43e..62eb5fc 100644 --- a/cura-engine.changes +++ b/cura-engine.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Dec 8 17:52:22 UTC 2017 - stefan.bruens@rwth-aachen.de + +- Fix License, Cura 3.0 and libraries are LGPL-3.0 now + +------------------------------------------------------------------- +Thu Dec 7 01:02:03 UTC 2017 - stefan.bruens@rwth-aachen.de + +- Revert parts of the previous commit breaking build on anything + but Leap 42.3 + ------------------------------------------------------------------- Fri Nov 3 07:20:42 UTC 2017 - adrian@suse.de diff --git a/cura-engine.spec b/cura-engine.spec index 9f7dc46..605c9f4 100644 --- a/cura-engine.spec +++ b/cura-engine.spec @@ -20,18 +20,18 @@ Name: cura-engine Version: 3.0.3 Release: 0 Summary: 3D printer control software -License: AGPL-3.0 -Group: BLAH +License: LGPL-3.0 +Group: Hardware/Printing Url: http://github.com/Ultimaker/CuraEngine Source0: https://github.com/Ultimaker/CuraEngine/archive/%{version}/CuraEngine-%{version}.tar.xz Source1: CuraEngine.1 Patch1: fix-build.patch +# On TW/Factory or Leap/SLE 15 use latest gcc, gcc6 otherwise %if 0%{?suse_version} >= 1500 -BuildRequires: gcc-c++ >= 7 +BuildRequires: gcc-c++ >= 5 %else BuildRequires: gcc6-c++ %endif -#!BuildIgnore: libgcc_s1 BuildRequires: cmake BuildRequires: libArcus-devel @@ -49,9 +49,8 @@ It is part of the larger open source project called "Cura". export CC=gcc-6 export CXX=g++-6 %endif -%cmake -DCMAKE_C_FLAGS="%{optflags} -fPIC" \ - -DCMAKE_CXX_FLAGS="%{optflags} -fPIC -fpermissive" -make %{?_smp_mflags} +%cmake -DCMAKE_POSITION_INDEPENDENT_CODE="true" +%make_jobs %install cd build