[cura] Require ultimaker2-marlin-firmware
Miro Hrončok
churchyard at fedoraproject.org
Wed Oct 16 14:40:16 UTC 2013
commit 0bda3ef750453e1dacef2fb19d54355b14644fa0
Author: Miro Hrončok <miro at hroncok.cz>
Date: Wed Oct 16 16:40:10 2013 +0200
Require ultimaker2-marlin-firmware
cura.spec | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/cura.spec b/cura.spec
index 861335b..c2fd05e 100644
--- a/cura.spec
+++ b/cura.spec
@@ -37,7 +37,8 @@ Requires: pyserial
Requires: numpy
Requires: python-power
Requires: pypy
-Requires: ultimaker-marlin-firmware >= 12.12-0.5.RC1
+Requires: ultimaker-marlin-firmware >= 13
+Requires: ultimaker2-marlin-firmware >= 13
Requires: CuraEngine
%description
@@ -62,7 +63,7 @@ dos2unix resources/example/Attribution.txt
%install
mkdir -p %{buildroot}%{python_sitelib}/Cura
-mkdir -p %{buildroot}%{_datadir}/%{name}
+mkdir -p %{buildroot}%{_datadir}/%{name}/firmware
mkdir -p %{buildroot}%{_datadir}/pixmaps
mkdir -p %{buildroot}%{_bindir}
@@ -72,7 +73,10 @@ cp -apr resources/* %{buildroot}%{_datadir}/%{name}
cp -ap %{SOURCE1} %{buildroot}%{_bindir}
ln -s %{_datadir}/%{name} %{buildroot}%{python_sitelib}/Cura/resources
ln -s %{_datadir}/%{name}/%{name}.ico %{buildroot}%{_datadir}/pixmaps
-ln -s %{_datadir}/ultimaker-marlin-firmware %{buildroot}%{_datadir}/%{name}/firmware
+for FILE in 250000-dual.hex 115200-dual.hex 250000.hex 115200.hex; do
+ ln -s ../../ultimaker-marlin-firmware/MarlinUltimaker-$FILE %{buildroot}%{_datadir}/%{name}/firmware/
+done
+ln -s ../../ultimaker2-marlin-firmware/MarlinUltimaker2.hex %{buildroot}%{_datadir}/%{name}/firmware/
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
@@ -86,7 +90,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
%changelog
* Wed Oct 16 2013 Miro Hrončok <mhroncok at redhat.com> - 13.10-1
-- New upstream release
+- New upstream release with CuraEngine
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 13.04-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list