diff --git a/.gitignore b/.gitignore index ecafe3d..2534169 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /cura-lulzbot-3.6.12.tar.gz /cura-lulzbot-3.6.18.tar.gz /cura-lulzbot-3.6.21.tar.gz +/cura-lulzbot-3.6.22.tar.gz diff --git a/cura-lulzbot.spec b/cura-lulzbot.spec index cbaae00..f61b9fd 100644 --- a/cura-lulzbot.spec +++ b/cura-lulzbot.spec @@ -1,15 +1,15 @@ %global shortname cura-lulzbot Name: cura-lulzbot -Version: 3.6.21 -Release: 5%{?dist} +Version: 3.6.22 +Release: 1%{?dist} Epoch: 1 Summary: 3D printer control software License: AGPLv3+ URL: https://code.alephobjects.com/project/profile/10/ -# git clone https://code.alephobjects.com/source/cura-lulzbot.git +# git clone https://gitlab.com/lulzbot3d/cura-le/cura-lulzbot.git # cd cura-lulzbot -# git checkout v3.6.21 +# git checkout v3.6.22 ## CANNOT use git archive here, need git hash for version # cd .. # mv cura-lulzbot cura-lulzbot-3.6.21 @@ -33,19 +33,20 @@ BuildRequires: gettext BuildRequires: git BuildRequires: python3-devel BuildRequires: python3-pytest -BuildRequires: python3-uranium-lulzbot == %{version} -BuildRequires: CuraEngine-lulzbot >= 1:%{version} +BuildRequires: python3-uranium-lulzbot >= 3.6.21 +BuildRequires: CuraEngine-lulzbot >= 1:3.6.21 Requires: open-sans-fonts Requires: python3-numpy-stl Requires: python3-pyserial Requires: python3-savitar >= 2.6 -Requires: python3-uranium-lulzbot == %{version} +Requires: python3-uranium-lulzbot >= 3.6.21 Requires: python3-zeroconf Requires: qt5-qtquickcontrols2, qt5-qtquickcontrols -Requires: CuraEngine-lulzbot >= 1:%{version} -Requires: lulzbot-marlin-firmware >= 1:1.1.9.34 -Requires: lulzbot-marlin-firmware-pro >= 1:2.0.0.144 +Requires: CuraEngine-lulzbot >= 1:3.6.21 +# -12 has the M175 firmware needed for cura-le 3.6.22 +Requires: lulzbot-marlin-firmware >= 1:1.1.9.34-12 +Requires: lulzbot-marlin-firmware-pro >= 1:2.0.0.144-12 Requires: lulzbot-marlin-firmware-bio >= 1:2.0.0.174 # lulzbot package has the materials inside it, does not conflict # Requires: cura-fdm-materials == %%{version} @@ -205,6 +206,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{shortname}.desktop %{_prefix}/lib/%{shortname} %changelog +* Wed Sep 23 2020 Tom Callaway - 1:3.6.22-1 +- update to 3.6.22 + * Mon Jul 27 2020 Fedora Release Engineering - 1:3.6.21-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index b769bcc..c2c7b91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cura-lulzbot-3.6.21.tar.gz) = fc9f936dbcb82486605ba7a9bb84bce919c17471b67a48886538937cd323788a679477cd3b8afaacac6d64568281fd75efc925cadc64a8d9639e8298d8699261 +SHA512 (cura-lulzbot-3.6.22.tar.gz) = ad4c93c16c7a0d68871d65c591e9ab45d004f22dcd4d1e537c3e086617e3269356b2c8a2fd6ef716c6798615128a575307aa4f958b7aa9df8a3d9b3503a6e956