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