- more fixes, partially works (doesn't generate gcode unfortunately)

diff --git a/cura b/cura
index 322824e5abb54998a6e8c62a4b455a022fe248e5..738e76f19a3aa3a23afbd174cdcce5aa72b71245 100755 (executable)
--- a/cura
+++ b/cura
@@ -9,7 +9,7 @@ for i in range(len(sys.argv)):
         sys.argv[i] = os.path.abspath(sys.argv[i])
 
 # change the pwd
-os.chdir("/usr/lib/python2.7/site-packages/")
+os.chdir("/usr/%s/python2.7/site-packages/" % sys.lib)
 
 # start cura
 cura.main()

diff --git a/cura-no-firmware.patch b/cura-no-firmware.patch
index 39a38734b9ad4835e7c42e5369102c9656797cf9..e3c92cb49b16fc60cd04d047333e3cc2923ad49d 100644 (file)
--- a/cura-no-firmware.patch
+++ b/cura-no-firmware.patch
@@ -54,7 +54,7 @@ diff -urN Cura-15.02.1.org/Cura/gui/firmwareInstall.py Cura-15.02.1/Cura/gui/fir
                        filename = getDefaultFirmware(machineIndex)
                if filename is None:
 -                      wx.MessageBox(_("I am sorry, but Cura does not ship with a default firmware for your machine configuration."), _("Firmware update"), wx.OK | wx.ICON_ERROR)
-+            wx.MessageBox(_("I am sorry, but Cura on Fedora does not ship firmware for technical reasons. Please go download it and install it as custom firmware instead."), _("Firmware update"), wx.OK | wx.ICON_ERROR)
++                      wx.MessageBox(_("I am sorry, but Cura on Fedora does not ship firmware for technical reasons. Please go download it and install it as custom firmware instead."), _("Firmware update"), wx.OK | wx.ICON_ERROR)
                        self.Destroy()
                        return
                self._machine_type = profile.getMachineSetting('machine_type', machineIndex)

diff --git a/cura.spec b/cura.spec
index 2b6cb254b9e582603a8a7553bedee0dafbc040f6..1de110d0a20749b12dd359859690216f198f3a2e 100644 (file)
--- a/cura.spec
+++ b/cura.spec
@@ -26,12 +26,13 @@ BuildRequires:      dos2unix
 BuildRequires: gettext
 BuildRequires: python-devel
 Requires:      CuraEngine >= 14.12.1
-Requires:      pypy
+#?
+#Requires:     pypy
 Requires:      python-PyOpenGL
 Requires:      python-numpy
 Requires:      python-power
 Requires:      python-serial
-Requires:      wxPython
+Requires:      python-wxPython
 BuildArch:     noarch
 
 %description