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/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 c2d748d..4c2139e 100644 --- a/cura-fdm-materials.spec +++ b/cura-fdm-materials.spec @@ -1,21 +1,25 @@ Name: cura-fdm-materials -Version: 4.7.1 -Release: 1%{?dist} +Version: 5.4.0 +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 +# Cmake bits taken from 4.13.1, before upstream went nuts with conan +Source2: CMakeLists.txt +Source3: CPackConfig.cmake + BuildArch: noarch -BuildRequires: cmake -Requires: cura == 1:%{version} +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} -# Get Fedora 33++ behavior on anything older -%undefine __cmake_in_source_build +BuildRequires: cmake +Requires: cura >= 1:%{version} %description Cura material files. @@ -25,6 +29,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 @@ -38,72 +45,4 @@ These files are needed to work with printers like Ultimaker 2+ and Ultimaker 3. %{_datadir}/cura/resources/materials/ %changelog -* 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 diff --git a/sources b/sources index 379060b..5009d3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cura-fdm-materials-4.7.1.tar.gz) = c852f9020d30d077cd51a10fb9235f0f1fd70fd799bdc1b8a96ac7f3d044113c27c08ff73d1816bb7cf2fd232ad57943a304b91df15aa05c39c43dcde501f07d +SHA512 (cura-fdm-materials-5.4.0.tar.gz) = 9cf2b1b9ac635e987f0c1679b1e3153b5acd853257b9e175fb6ffff02dac9ea630088fa864c2c3908a293fb845b6f3f1c7e9bbf46e63d17d9fdbe4525d2cf5d6