From 7707e1bb5b922997739fb88373336844fe3bc601 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 02:51:08 +0000 Subject: [PATCH 01/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cura-fdm-materials.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index 8651b04..7f05bf4 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -1,6 +1,6 @@ Name: cura-fdm-materials Version: 4.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cura FDM Material database # See https://github.com/Ultimaker/Cura/issues/1779 for clarification @@ -38,6 +38,9 @@ These files are needed to work with printers like Ultimaker 2+ and Ultimaker 3. %{_datadir}/cura/resources/materials/ %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 4.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Dec 23 2020 Jan Pazdziora - 4.8.0-1 - Update to 4.8.0 From 73b785172a26a8e7a48d3ca646cce943d310dfbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Tue, 4 May 2021 18:32:34 +0200 Subject: [PATCH 02/28] Update to 4.9.0 --- cura-fdm-materials.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index 7f05bf4..635feb0 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -1,6 +1,6 @@ Name: cura-fdm-materials -Version: 4.8.0 -Release: 2%{?dist} +Version: 4.9.0 +Release: 1%{?dist} Summary: Cura FDM Material database # See https://github.com/Ultimaker/Cura/issues/1779 for clarification @@ -38,6 +38,9 @@ These files are needed to work with printers like Ultimaker 2+ and Ultimaker 3. %{_datadir}/cura/resources/materials/ %changelog +* Mon Apr 26 2021 Gabriel Féron - 4.9.0-1 +- Update to 4.9.0 + * Tue Jan 26 2021 Fedora Release Engineering - 4.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 3e6366f..c143471 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cura-fdm-materials-4.8.0.tar.gz) = 6e2812dc61ad00437d4c7943c3746cd915e1e49edef49f89ea2c4ca4cf023d67c400d1ae1e3c40923928d20ac09b184fc0632b828900b6236f9dfd346f19036d +SHA512 (cura-fdm-materials-4.9.0.tar.gz) = fd1115958f7013d711cc75aeeb0fe88705df9d82da0ef69410f7d616c5ef4bfef517e750fe806a985b12e95b17d7e861e0490986400cddaa7a0552e6555a0a34 From a68daaefcc53a700ade5b1ef327f4f1b893b6801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Thu, 10 Jun 2021 15:51:39 +0200 Subject: [PATCH 03/28] Update to 4.9.1 --- cura-fdm-materials.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index 635feb0..1cf124a 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -1,5 +1,5 @@ Name: cura-fdm-materials -Version: 4.9.0 +Version: 4.9.1 Release: 1%{?dist} Summary: Cura FDM Material database @@ -38,6 +38,9 @@ These files are needed to work with printers like Ultimaker 2+ and Ultimaker 3. %{_datadir}/cura/resources/materials/ %changelog +* Thu Jun 10 2021 Gabriel Féron - 4.9.1-1 +- Update to 4.9.1 + * Mon Apr 26 2021 Gabriel Féron - 4.9.0-1 - Update to 4.9.0 diff --git a/sources b/sources index c143471..4845d8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cura-fdm-materials-4.9.0.tar.gz) = fd1115958f7013d711cc75aeeb0fe88705df9d82da0ef69410f7d616c5ef4bfef517e750fe806a985b12e95b17d7e861e0490986400cddaa7a0552e6555a0a34 +SHA512 (cura-fdm-materials-4.9.1.tar.gz) = a615e1a75e0125642c348aeb28a1a52d1a32bec6946c8d4d6788455442cbdb2575326c7331c429df2031f1eb41b790dfd929792b40296262f18150decaf8baed From 0a25b182e94d19c1861adc1aea8b71a1a1cb7c3b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 20:15:18 +0000 Subject: [PATCH 04/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cura-fdm-materials.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index 1cf124a..501586e 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -1,6 +1,6 @@ Name: cura-fdm-materials Version: 4.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cura FDM Material database # See https://github.com/Ultimaker/Cura/issues/1779 for clarification @@ -38,6 +38,9 @@ These files are needed to work with printers like Ultimaker 2+ and Ultimaker 3. %{_datadir}/cura/resources/materials/ %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 4.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jun 10 2021 Gabriel Féron - 4.9.1-1 - Update to 4.9.1 From 787ef970052efb0d14620e3ca403331d848c5313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Mon, 16 Aug 2021 12:15:49 +0200 Subject: [PATCH 05/28] Update to 4.10.0 --- cura-fdm-materials.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index 501586e..89b455d 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -1,6 +1,6 @@ Name: cura-fdm-materials -Version: 4.9.1 -Release: 2%{?dist} +Version: 4.10.0 +Release: 1%{?dist} Summary: Cura FDM Material database # See https://github.com/Ultimaker/Cura/issues/1779 for clarification @@ -38,6 +38,9 @@ These files are needed to work with printers like Ultimaker 2+ and Ultimaker 3. %{_datadir}/cura/resources/materials/ %changelog +* Mon Aug 16 2021 Gabriel Féron - 4.10.0-1 +- Update to 4.10.0 + * Wed Jul 21 2021 Fedora Release Engineering - 4.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 4845d8c..30a64b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cura-fdm-materials-4.9.1.tar.gz) = a615e1a75e0125642c348aeb28a1a52d1a32bec6946c8d4d6788455442cbdb2575326c7331c429df2031f1eb41b790dfd929792b40296262f18150decaf8baed +SHA512 (cura-fdm-materials-4.10.0.tar.gz) = 629726b88b56e7e1ae20c60f19f86d5bdb33b0844b9309f1bd3ac0cb294b586ed658432072cca4c8b3d1d990d5d4a21aa5f426d7ef1d580bc1f44a0a8cccb2ff From cd082a726104533637b427b1cb16b4d817ebbb28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Thu, 16 Sep 2021 00:02:13 +0200 Subject: [PATCH 06/28] Update to 4.11.0 --- cura-fdm-materials.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index 89b455d..ce4ff12 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -1,5 +1,5 @@ Name: cura-fdm-materials -Version: 4.10.0 +Version: 4.11.0 Release: 1%{?dist} Summary: Cura FDM Material database @@ -38,6 +38,9 @@ These files are needed to work with printers like Ultimaker 2+ and Ultimaker 3. %{_datadir}/cura/resources/materials/ %changelog +* Wed Sep 15 2021 Gabriel Féron - 4.11.0-1 +- Update to 4.11.0 + * Mon Aug 16 2021 Gabriel Féron - 4.10.0-1 - Update to 4.10.0 diff --git a/sources b/sources index 30a64b5..9cf8d4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cura-fdm-materials-4.10.0.tar.gz) = 629726b88b56e7e1ae20c60f19f86d5bdb33b0844b9309f1bd3ac0cb294b586ed658432072cca4c8b3d1d990d5d4a21aa5f426d7ef1d580bc1f44a0a8cccb2ff +SHA512 (cura-fdm-materials-4.11.0.tar.gz) = 250f39914ead8261f9b6e2bc4ac6e31e4c8fcc767a6c05f608502212f047b7893a03cbc13c95cb0c3a4affb77c2b7f3032c87cb53f7c6e11c992904b8373bf35 From ec38e3199890dca85f08b7345b73a3139fcfe074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Mon, 13 Dec 2021 09:52:25 +0100 Subject: [PATCH 07/28] Update to 4.12.0 --- cura-fdm-materials.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index ce4ff12..29128d1 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -1,5 +1,5 @@ Name: cura-fdm-materials -Version: 4.11.0 +Version: 4.12.0 Release: 1%{?dist} Summary: Cura FDM Material database @@ -12,7 +12,7 @@ Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: cmake -Requires: cura == 1:%{version} +Requires: cura >= 1:%{version} # Get Fedora 33++ behavior on anything older %undefine __cmake_in_source_build @@ -38,6 +38,9 @@ These files are needed to work with printers like Ultimaker 2+ and Ultimaker 3. %{_datadir}/cura/resources/materials/ %changelog +* Mon Dec 13 2021 Gabriel Féron - 4.12.1-1 +- Update to 4.12.1 + * Wed Sep 15 2021 Gabriel Féron - 4.11.0-1 - Update to 4.11.0 diff --git a/sources b/sources index 9cf8d4d..db790ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cura-fdm-materials-4.11.0.tar.gz) = 250f39914ead8261f9b6e2bc4ac6e31e4c8fcc767a6c05f608502212f047b7893a03cbc13c95cb0c3a4affb77c2b7f3032c87cb53f7c6e11c992904b8373bf35 +SHA512 (cura-fdm-materials-4.12.0.tar.gz) = 891ba751dd94d5e733c2b283b39549dbdc075fcacbbc77598cdfcc944a225c9bded3c2f5ba75f5538bccfc8484cf7a7fcab869c199d81c047ac236225220f230 From fdcfdc00d193347fb4f62b367ebeb61fdfa7f9d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Sat, 1 Jan 2022 19:00:59 +0100 Subject: [PATCH 08/28] Use global over define --- cura-fdm-materials.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index 29128d1..89f4723 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -1,3 +1,7 @@ +%global major_minor_version 4.12 +%global next_major_minor_version 4.13 +%global patch_version 0 + Name: cura-fdm-materials Version: 4.12.0 Release: 1%{?dist} From d9bbbc5af52c7548147231841064ab17b7fb1944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Sat, 1 Jan 2022 19:01:14 +0100 Subject: [PATCH 09/28] Fix version requires condition --- cura-fdm-materials.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index 89f4723..5e85028 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -3,7 +3,7 @@ %global patch_version 0 Name: cura-fdm-materials -Version: 4.12.0 +Version: %{major_minor_version}.%{patch_version} Release: 1%{?dist} Summary: Cura FDM Material database @@ -16,7 +16,7 @@ Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: cmake -Requires: cura >= 1:%{version} +Requires: (cura >= 1:%{major_minor_version} with cura < 1:%{next_major_minor_version}) # Get Fedora 33++ behavior on anything older %undefine __cmake_in_source_build From 70c02dafced7aced9030d02d369184d21d22067a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 00:08:18 +0000 Subject: [PATCH 10/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cura-fdm-materials.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index 5e85028..786c6e6 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -4,7 +4,7 @@ Name: cura-fdm-materials Version: %{major_minor_version}.%{patch_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cura FDM Material database # See https://github.com/Ultimaker/Cura/issues/1779 for clarification @@ -42,6 +42,9 @@ These files are needed to work with printers like Ultimaker 2+ and Ultimaker 3. %{_datadir}/cura/resources/materials/ %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 4.12.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Dec 13 2021 Gabriel Féron - 4.12.1-1 - Update to 4.12.1 From c8a23581a69c1e065802053db0db76d44cb08ac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= Date: Tue, 11 Jan 2022 20:19:14 +0100 Subject: [PATCH 11/28] Update to 4.13.0 --- cura-fdm-materials.spec | 13 ++++++------- sources | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index 786c6e6..e4d486e 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -1,10 +1,6 @@ -%global major_minor_version 4.12 -%global next_major_minor_version 4.13 -%global patch_version 0 - Name: cura-fdm-materials -Version: %{major_minor_version}.%{patch_version} -Release: 2%{?dist} +Version: 4.13.0 +Release: 1%{?dist} Summary: Cura FDM Material database # See https://github.com/Ultimaker/Cura/issues/1779 for clarification @@ -16,7 +12,7 @@ Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: cmake -Requires: (cura >= 1:%{major_minor_version} with cura < 1:%{next_major_minor_version}) +Requires: cura >= 1:%{version} # Get Fedora 33++ behavior on anything older %undefine __cmake_in_source_build @@ -42,6 +38,9 @@ These files are needed to work with printers like Ultimaker 2+ and Ultimaker 3. %{_datadir}/cura/resources/materials/ %changelog +* Tue Feb 01 2022 Gabriel Féron - 4.13.0-1 +- Update to 4.13.0 + * Thu Jan 20 2022 Fedora Release Engineering - 4.12.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index db790ef..75a30ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cura-fdm-materials-4.12.0.tar.gz) = 891ba751dd94d5e733c2b283b39549dbdc075fcacbbc77598cdfcc944a225c9bded3c2f5ba75f5538bccfc8484cf7a7fcab869c199d81c047ac236225220f230 +SHA512 (cura-fdm-materials-4.13.0.tar.gz) = 12e08d3f0a7871b95f70ad0c5fae9027923de004595c0516df34dbe91b59ed13092b984cf1e11ac6162c577f157cb17195dcca9e4aa97e5c0fc9721a640a0a21 From 8cac7140d326f65a64a538bbf977f5e53ab0ea26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 18 Jul 2022 14:44:58 +0200 Subject: [PATCH 12/28] https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval --- cura-fdm-materials.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index e4d486e..56dcaab 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -11,6 +11,11 @@ Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildArch: noarch +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 +ExcludeArch: %{ix86} +%endif + BuildRequires: cmake Requires: cura >= 1:%{version} From 43f1ed920db692d484db8e3d342826cd9161d713 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 23:54:06 +0000 Subject: [PATCH 13/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cura-fdm-materials.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index 56dcaab..f7dae63 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -1,6 +1,6 @@ Name: cura-fdm-materials Version: 4.13.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cura FDM Material database # See https://github.com/Ultimaker/Cura/issues/1779 for clarification @@ -43,6 +43,9 @@ These files are needed to work with printers like Ultimaker 2+ and Ultimaker 3. %{_datadir}/cura/resources/materials/ %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 4.13.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Feb 01 2022 Gabriel Féron - 4.13.0-1 - Update to 4.13.0 From 86e1c7545a29c0ef47a5a1c66be9bb53b42bf5d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:50:20 +0000 Subject: [PATCH 14/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cura-fdm-materials.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index f7dae63..b8ea42f 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -1,6 +1,6 @@ Name: cura-fdm-materials Version: 4.13.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Cura FDM Material database # See https://github.com/Ultimaker/Cura/issues/1779 for clarification @@ -43,6 +43,9 @@ These files are needed to work with printers like Ultimaker 2+ and Ultimaker 3. %{_datadir}/cura/resources/materials/ %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 4.13.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 4.13.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 25c497c563ef0299b5c9bd47a37bb668870db720 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 9 Mar 2023 11:31:51 -0500 Subject: [PATCH 15/28] update to 5.3.0 --- CMakeLists.txt | 38 ++++++++++++++++++++++++++++++++++++++ CPackConfig.cmake | 10 ++++++++++ cura-fdm-materials.spec | 14 ++++++++++++-- sources | 2 +- 4 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 CPackConfig.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..89a2950 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,38 @@ +project(fdm-materials NONE) + +cmake_minimum_required(VERSION 2.8.12) + +include(CMakePackageConfigHelpers) + +option(EMBEDDED "Build for Ultimaker Embedded software" OFF) + +if(NOT EMBEDDED) + set(INSTALL_PATH "share/cura/resources/materials" + CACHE PATH + "The path to install the materials to. Should ideally be relative to CMAKE_INSTALL_PREFIX" + ) +else() + # Then we're cmaking for Jedi + set(INSTALL_PATH "share/fdm_materials" + CACHE STRING + "Destination to install the materials to. Should be relative to CMAKE_INSTALL_PREFIX") + + if(IS_ABSOLUTE ${INSTALL_PATH}) + set(INSTALL_PATH ${INSTALL_PATH}) + else() + set(INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/${INSTALL_PATH}) + endif() +endif() + +file(GLOB _files *.fdm_material *.sig) + +# Determine version number +find_package(Git) + +if (DEFINED ENV{GITHUB_ACTIONS}) + set(CPACK_PACKAGE_VERSION "${GIT_VERSION}+$ENV{GITHUB_SHA}") +endif() + +install(FILES ${_files} DESTINATION ${INSTALL_PATH}) + +include(CPackConfig.cmake) diff --git a/CPackConfig.cmake b/CPackConfig.cmake new file mode 100644 index 0000000..35905c2 --- /dev/null +++ b/CPackConfig.cmake @@ -0,0 +1,10 @@ +set(CPACK_PACKAGE_VENDOR "Ultimaker") +set(CPACK_PACKAGE_CONTACT "Ultimaker ") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Ultimaker Embedded services") +set(CPACK_PACKAGE_VERSION_MAJOR 999) +set(CPACK_PACKAGE_VERSION_MINOR 999) +set(CPACK_PACKAGE_VERSION_PATCH 999) +set(CPACK_GENERATOR "DEB") +set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE all) + +include(CPack) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index b8ea42f..282a178 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -1,6 +1,6 @@ Name: cura-fdm-materials -Version: 4.13.0 -Release: 3%{?dist} +Version: 5.3.0 +Release: 1%{?dist} Summary: Cura FDM Material database # See https://github.com/Ultimaker/Cura/issues/1779 for clarification @@ -9,6 +9,10 @@ License: Public Domain URL: https://github.com/Ultimaker/fdm_materials Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# Cmake bits taken from 4.13.1, before upstream went nuts with conan +Source2: CMakeLists.txt +Source3: CPackConfig.cmake + BuildArch: noarch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval @@ -30,6 +34,9 @@ These files are needed to work with printers like Ultimaker 2+ and Ultimaker 3. %prep %autosetup -n fdm_materials-%{version} -p1 +rm -rf CMakeLists.txt +cp %{SOURCE2} %{SOURCE3} . + %build %cmake %cmake_build @@ -43,6 +50,9 @@ These files are needed to work with printers like Ultimaker 2+ and Ultimaker 3. %{_datadir}/cura/resources/materials/ %changelog +* Thu Mar 9 2023 Tom Callaway - 5.3.0-1 +- update to 5.3.0 + * Thu Jan 19 2023 Fedora Release Engineering - 4.13.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 75a30ba..a08c571 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cura-fdm-materials-4.13.0.tar.gz) = 12e08d3f0a7871b95f70ad0c5fae9027923de004595c0516df34dbe91b59ed13092b984cf1e11ac6162c577f157cb17195dcca9e4aa97e5c0fc9721a640a0a21 +SHA512 (cura-fdm-materials-5.3.0.tar.gz) = 642a099f336d19b03261c07639cf8288335a4b9bf240011a93871e3fb9232874b51c76fb30d70d13e828083207aaf53d6456712c209599cf8ac76c7da46fc45d From 2201afab767acfd440a301db68ebca1eb773f53d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 16:48:48 +0000 Subject: [PATCH 16/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cura-fdm-materials.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index 282a178..254d9e9 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -1,6 +1,6 @@ Name: cura-fdm-materials Version: 5.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cura FDM Material database # See https://github.com/Ultimaker/Cura/issues/1779 for clarification @@ -50,6 +50,9 @@ cp %{SOURCE2} %{SOURCE3} . %{_datadir}/cura/resources/materials/ %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 5.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Mar 9 2023 Tom Callaway - 5.3.0-1 - update to 5.3.0 From 0bd06c022add681f0d5835d37a85ec9e6420325f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 6 Dec 2023 14:58:54 +0100 Subject: [PATCH 17/28] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 110 ++++++++++++++++++++++++++++++++++++++ cura-fdm-materials.spec | 114 +--------------------------------------- 2 files changed, 112 insertions(+), 112 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..6ddb3b7 --- /dev/null +++ b/changelog @@ -0,0 +1,110 @@ +* Wed Jul 19 2023 Fedora Release Engineering - 5.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Mar 9 2023 Tom Callaway - 5.3.0-1 +- update to 5.3.0 + +* Thu Jan 19 2023 Fedora Release Engineering - 4.13.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 4.13.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue Feb 01 2022 Gabriel Féron - 4.13.0-1 +- Update to 4.13.0 + +* Thu Jan 20 2022 Fedora Release Engineering - 4.12.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Dec 13 2021 Gabriel Féron - 4.12.1-1 +- Update to 4.12.1 + +* Wed Sep 15 2021 Gabriel Féron - 4.11.0-1 +- Update to 4.11.0 + +* Mon Aug 16 2021 Gabriel Féron - 4.10.0-1 +- Update to 4.10.0 + +* Wed Jul 21 2021 Fedora Release Engineering - 4.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jun 10 2021 Gabriel Féron - 4.9.1-1 +- Update to 4.9.1 + +* Mon Apr 26 2021 Gabriel Féron - 4.9.0-1 +- Update to 4.9.0 + +* Tue Jan 26 2021 Fedora Release Engineering - 4.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Dec 23 2020 Jan Pazdziora - 4.8.0-1 +- Update to 4.8.0 + +* Thu Sep 03 2020 Miro Hrončok - 4.7.1-1 +- Update to 4.7.1 + +* Mon Aug 31 2020 Gabriel Féron - 4.7.0-1 +- Update to 4.7.0 + +* Mon Jul 27 2020 Fedora Release Engineering - 4.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 5 2020 Gabriel Féron - 4.6.0-1 +- Update to 4.6.1 + +* Tue Apr 21 2020 Gabriel Féron - 4.6.0-1 +- Update to 4.6.0 + +* Tue Jan 28 2020 Fedora Release Engineering - 4.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Nov 21 2019 Gabriel Féron - 4.4.0-1 +- Update to 4.4.0 + +* Wed Jul 24 2019 Fedora Release Engineering - 4.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jun 18 2019 Gabriel Féron - 4.1.0-1 +- Update to 4.1.0 + +* Wed Apr 03 2019 Gabriel Féron - 4.0.0-1 +- Update to 4.0.0 + +* Thu Jan 31 2019 Fedora Release Engineering - 3.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jan 26 2019 Gabriel Féron - 3.6.0-1 +- Update to 3.6.0 + +* Mon Nov 12 2018 Miro Hrončok - 3.5.1-1 +- Update to 3.5.1 (#1644323) + +* Tue Aug 28 2018 Miro Hrončok - 3.4.1-1 +- Update to 3.4.1 (#1599711) + +* Thu Jul 12 2018 Fedora Release Engineering - 3.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed May 02 2018 Miro Hrončok - 3.3.0-1 +- Update to 3.3.0 (#1572931) + +* Tue Mar 20 2018 Miro Hrončok - 3.2.1-1 +- Update to 3.2.1 (#1523960) + +* Wed Feb 07 2018 Fedora Release Engineering - 3.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Dec 10 2017 Miro Hrončok - 3.1.0-1 +- Update to 3.1.0 (#1523960) + +* Mon Oct 23 2017 Miro Hrončok - 3.0.3-1 +- Update to 3.0.3 (#1504321) + +* Wed Aug 30 2017 Miro Hrončok - 2.7.0-1 +- Update to 2.7.0 (#1486725) + +* Wed Jul 26 2017 Fedora Release Engineering - 2.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jun 28 2017 Miro Hrončok - 2.6.1-1 +- New package diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index 254d9e9..4ef211a 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -1,6 +1,6 @@ Name: cura-fdm-materials Version: 5.3.0 -Release: 2%{?dist} +Release: %autorelease Summary: Cura FDM Material database # See https://github.com/Ultimaker/Cura/issues/1779 for clarification @@ -50,114 +50,4 @@ cp %{SOURCE2} %{SOURCE3} . %{_datadir}/cura/resources/materials/ %changelog -* Wed Jul 19 2023 Fedora Release Engineering - 5.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Mar 9 2023 Tom Callaway - 5.3.0-1 -- update to 5.3.0 - -* Thu Jan 19 2023 Fedora Release Engineering - 4.13.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 4.13.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Feb 01 2022 Gabriel Féron - 4.13.0-1 -- Update to 4.13.0 - -* Thu Jan 20 2022 Fedora Release Engineering - 4.12.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Dec 13 2021 Gabriel Féron - 4.12.1-1 -- Update to 4.12.1 - -* Wed Sep 15 2021 Gabriel Féron - 4.11.0-1 -- Update to 4.11.0 - -* Mon Aug 16 2021 Gabriel Féron - 4.10.0-1 -- Update to 4.10.0 - -* Wed Jul 21 2021 Fedora Release Engineering - 4.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jun 10 2021 Gabriel Féron - 4.9.1-1 -- Update to 4.9.1 - -* Mon Apr 26 2021 Gabriel Féron - 4.9.0-1 -- Update to 4.9.0 - -* Tue Jan 26 2021 Fedora Release Engineering - 4.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Dec 23 2020 Jan Pazdziora - 4.8.0-1 -- Update to 4.8.0 - -* Thu Sep 03 2020 Miro Hrončok - 4.7.1-1 -- Update to 4.7.1 - -* Mon Aug 31 2020 Gabriel Féron - 4.7.0-1 -- Update to 4.7.0 - -* Mon Jul 27 2020 Fedora Release Engineering - 4.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 5 2020 Gabriel Féron - 4.6.0-1 -- Update to 4.6.1 - -* Tue Apr 21 2020 Gabriel Féron - 4.6.0-1 -- Update to 4.6.0 - -* Tue Jan 28 2020 Fedora Release Engineering - 4.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Nov 21 2019 Gabriel Féron - 4.4.0-1 -- Update to 4.4.0 - -* Wed Jul 24 2019 Fedora Release Engineering - 4.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Jun 18 2019 Gabriel Féron - 4.1.0-1 -- Update to 4.1.0 - -* Wed Apr 03 2019 Gabriel Féron - 4.0.0-1 -- Update to 4.0.0 - -* Thu Jan 31 2019 Fedora Release Engineering - 3.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jan 26 2019 Gabriel Féron - 3.6.0-1 -- Update to 3.6.0 - -* Mon Nov 12 2018 Miro Hrončok - 3.5.1-1 -- Update to 3.5.1 (#1644323) - -* Tue Aug 28 2018 Miro Hrončok - 3.4.1-1 -- Update to 3.4.1 (#1599711) - -* Thu Jul 12 2018 Fedora Release Engineering - 3.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed May 02 2018 Miro Hrončok - 3.3.0-1 -- Update to 3.3.0 (#1572931) - -* Tue Mar 20 2018 Miro Hrončok - 3.2.1-1 -- Update to 3.2.1 (#1523960) - -* Wed Feb 07 2018 Fedora Release Engineering - 3.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Dec 10 2017 Miro Hrončok - 3.1.0-1 -- Update to 3.1.0 (#1523960) - -* Mon Oct 23 2017 Miro Hrončok - 3.0.3-1 -- Update to 3.0.3 (#1504321) - -* Wed Aug 30 2017 Miro Hrončok - 2.7.0-1 -- Update to 2.7.0 (#1486725) - -* Wed Jul 26 2017 Fedora Release Engineering - 2.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Jun 28 2017 Miro Hrončok - 2.6.1-1 -- New package - +%autochangelog From 0523d30494fbfc834a77d0551da1d4b9cabdedff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 6 Dec 2023 14:59:57 +0100 Subject: [PATCH 18/28] Remove old cruft --- cura-fdm-materials.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index 4ef211a..66edcd8 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -16,16 +16,11 @@ Source3: CPackConfig.cmake BuildArch: noarch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 ExcludeArch: %{ix86} -%endif BuildRequires: cmake Requires: cura >= 1:%{version} -# Get Fedora 33++ behavior on anything older -%undefine __cmake_in_source_build - %description Cura material files. From 7e76ff2d7129d58494b3fd415172416a521a6261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 6 Dec 2023 15:00:30 +0100 Subject: [PATCH 19/28] Update the License tag to SPDX --- cura-fdm-materials.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index 66edcd8..9797f8f 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -4,7 +4,7 @@ Release: %autorelease Summary: Cura FDM Material database # See https://github.com/Ultimaker/Cura/issues/1779 for clarification -License: Public Domain +License: LicenseRef-Fedora-Public-Domain URL: https://github.com/Ultimaker/fdm_materials Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz From 7e35c736eabbee414ab3dd71abf39b69c7ceb48f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 6 Dec 2023 15:00:47 +0100 Subject: [PATCH 20/28] Update to 5.4.0 --- cura-fdm-materials.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index 9797f8f..4c2139e 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -1,5 +1,5 @@ Name: cura-fdm-materials -Version: 5.3.0 +Version: 5.4.0 Release: %autorelease Summary: Cura FDM Material database diff --git a/sources b/sources index a08c571..5009d3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cura-fdm-materials-5.3.0.tar.gz) = 642a099f336d19b03261c07639cf8288335a4b9bf240011a93871e3fb9232874b51c76fb30d70d13e828083207aaf53d6456712c209599cf8ac76c7da46fc45d +SHA512 (cura-fdm-materials-5.4.0.tar.gz) = 9cf2b1b9ac635e987f0c1679b1e3153b5acd853257b9e175fb6ffff02dac9ea630088fa864c2c3908a293fb845b6f3f1c7e9bbf46e63d17d9fdbe4525d2cf5d6 From 1361d947f9b7328c1fc35da049f9777bbbd7ceec Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 22 Dec 2023 11:35:29 -0500 Subject: [PATCH 21/28] 5.6.0 --- cura-fdm-materials.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index 4c2139e..9a8473c 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -1,5 +1,5 @@ Name: cura-fdm-materials -Version: 5.4.0 +Version: 5.6.0 Release: %autorelease Summary: Cura FDM Material database diff --git a/sources b/sources index 5009d3c..ef2fd7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cura-fdm-materials-5.4.0.tar.gz) = 9cf2b1b9ac635e987f0c1679b1e3153b5acd853257b9e175fb6ffff02dac9ea630088fa864c2c3908a293fb845b6f3f1c7e9bbf46e63d17d9fdbe4525d2cf5d6 +SHA512 (cura-fdm-materials-5.6.0.tar.gz) = f29538bcabc11dec2e562e6b7fe4472e79a7f597430ed7b072d9b55706e9ae219af918df1e5165e9a6bdfdbd3821dc2fd7ccefb62b7846418307102fb5b9d273 From baff9848ed7bd60bf0e7d164dca65865a4b5744a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 16:32:05 +0000 Subject: [PATCH 22/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b68436e91a3407bc957f95b3bd7cf72904bf6250 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 08:43:36 +0000 Subject: [PATCH 23/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6526e525671e8c6edd3f2afa284d94380b5889dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 29 Jan 2024 19:48:16 +0100 Subject: [PATCH 24/28] Undo the 5.6.0 update - Fixes: rhbz#2260904 This reverts commit 1361d947f9b7328c1fc35da049f9777bbbd7ceec. --- cura-fdm-materials.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cura-fdm-materials.spec b/cura-fdm-materials.spec index 9a8473c..4c2139e 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -1,5 +1,5 @@ Name: cura-fdm-materials -Version: 5.6.0 +Version: 5.4.0 Release: %autorelease Summary: Cura FDM Material database diff --git a/sources b/sources index ef2fd7c..5009d3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cura-fdm-materials-5.6.0.tar.gz) = f29538bcabc11dec2e562e6b7fe4472e79a7f597430ed7b072d9b55706e9ae219af918df1e5165e9a6bdfdbd3821dc2fd7ccefb62b7846418307102fb5b9d273 +SHA512 (cura-fdm-materials-5.4.0.tar.gz) = 9cf2b1b9ac635e987f0c1679b1e3153b5acd853257b9e175fb6ffff02dac9ea630088fa864c2c3908a293fb845b6f3f1c7e9bbf46e63d17d9fdbe4525d2cf5d6 From c68f17e56078b34e35e657d05ac7055fb9ebab4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 29 Jan 2024 19:59:04 +0100 Subject: [PATCH 25/28] Bump for a higher Release [skip changelog] From 1123ec397b4dc7dc130c532f4a9f795b54e562cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 20:23:11 +0000 Subject: [PATCH 26/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From ee0a7250d45b62857c0a6914c68768b26bbc4c93 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 15:04:56 +0000 Subject: [PATCH 27/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ae00a6a1e419c4d784f35926f14a452d6392139f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:56:26 +0000 Subject: [PATCH 28/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild