[cura] 13.10 now builds
Miro Hrončok
churchyard at fedoraproject.org
Wed Oct 16 12:13:11 UTC 2013
commit cafe8c4bd26ed3c0d7001d53a9da79fbfbee0581
Author: Miro Hrončok <miro at hroncok.cz>
Date: Wed Oct 16 14:00:03 2013 +0200
13.10 now builds
cura-future-import-first.patch | 23 +++++++++++++++++++++++
cura.spec | 17 +++++++----------
2 files changed, 30 insertions(+), 10 deletions(-)
---
diff --git a/cura-future-import-first.patch b/cura-future-import-first.patch
new file mode 100644
index 0000000..ceac7c2
--- /dev/null
+++ b/cura-future-import-first.patch
@@ -0,0 +1,23 @@
+diff --git a/gui/tools/batchRun.py b/gui/tools/batchRun.py
+index 14c1e56..8ec19c4 100644
+--- a/gui/tools/batchRun.py
++++ b/gui/tools/batchRun.py
+@@ -1,5 +1,5 @@
+-__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License"
+ from __future__ import absolute_import
++__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License"
+
+ import wx, os, multiprocessing, threading, time, shutil
+
+diff --git a/gui/util/toolbarUtil.py b/gui/util/toolbarUtil.py
+index b4934a4..93e1881 100644
+--- a/gui/util/toolbarUtil.py
++++ b/gui/util/toolbarUtil.py
+@@ -1,6 +1,6 @@
+-__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License"
+ from __future__ import absolute_import
+ from __future__ import division
++__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License"
+
+ import wx
+ from wx.lib import buttons
diff --git a/cura.spec b/cura.spec
index 9a1e989..ab5efab 100644
--- a/cura.spec
+++ b/cura.spec
@@ -13,12 +13,14 @@ URL: http://daid.github.com/Cura/
# I've stripped the source with the script in Source3
# To remove CC BY-NC content and bundled pypy binaries
# Already asked upstream to include free package
-#Source0: http://software.ultimaker.com/current/Cura-%%{version}-linux.tar.gz
-Source0: Cura-%{version}-linux-fedora.tar.gz
+Source0: Cura-%{version}-fedora.tar.gz
Source1: %{name}
Source2: %{name}.desktop
Source3: %{name}-stripper.sh
+# SyntaxError: from __future__ imports must occur at the beginning of the file
+Patch0: %{name}-future-import-first.patch
+
BuildArch: noarch
BuildRequires: python2-devel
BuildRequires: dos2unix
@@ -30,6 +32,7 @@ Requires: numpy
Requires: python-power
Requires: pypy
Requires: ultimaker-marlin-firmware >= 12.12-0.5.RC1
+Requires: CuraEngine
%description
Cura is a project which aims to be an single software solution for 3D printing.
@@ -41,17 +44,11 @@ positioning, can slice the model to G-Code, with sane editable configuration
settings and send this G-Code to the 3D printer for printing.
%prep
-%setup -qn Cura-%{version}-linux/Cura
+%setup -qn Cura-%{version}/Cura
+%patch0 -p1
dos2unix resources/example/Attribution.txt
-# Remove useless shebangs
-cd slice/cura_sf/skeinforge_application/skeinforge_plugins/craft_plugins
-for FILE in alteration.py scale.py dimension.py limit.py fill.py inset.py widen.py bottom.py preface.py ../../../../../cura.py ../../../../../util/pymclevel/mce.py; do
- awk 'FNR>1' $FILE > $FILE.nobang && mv -f $FILE.nobang $FILE
-done
-cd -
-
%build
# do nothing
More information about the scm-commits
mailing list