Compare commits
No commits in common. "rawhide" and "f29" have entirely different histories.
6 changed files with 57 additions and 178 deletions
10
.gitignore
vendored
10
.gitignore
vendored
|
|
@ -1 +1,9 @@
|
|||
/cura-fdm-materials-*.tar.gz
|
||||
/cura-fdm-materials-2.6.1.tar.gz
|
||||
/cura-fdm-materials-2.7.0.tar.gz
|
||||
/cura-fdm-materials-3.0.3.tar.gz
|
||||
/cura-fdm-materials-3.1.0.tar.gz
|
||||
/cura-fdm-materials-3.2.1.tar.gz
|
||||
/cura-fdm-materials-3.3.0.tar.gz
|
||||
/cura-fdm-materials-3.4.1.tar.gz
|
||||
/cura-fdm-materials-3.5.1.tar.gz
|
||||
/cura-fdm-materials-3.6.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
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)
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
set(CPACK_PACKAGE_VENDOR "Ultimaker")
|
||||
set(CPACK_PACKAGE_CONTACT "Ultimaker <info@ultimaker.com>")
|
||||
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)
|
||||
110
changelog
110
changelog
|
|
@ -1,110 +0,0 @@
|
|||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Mar 9 2023 Tom Callaway <spot@fedoraproject.org> - 5.3.0-1
|
||||
- update to 5.3.0
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.13.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.13.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Tue Feb 01 2022 Gabriel Féron <feron.gabriel@gmail.com> - 4.13.0-1
|
||||
- Update to 4.13.0
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.12.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Mon Dec 13 2021 Gabriel Féron <feron.gabriel@gmail.com> - 4.12.1-1
|
||||
- Update to 4.12.1
|
||||
|
||||
* Wed Sep 15 2021 Gabriel Féron <feron.gabriel@gmail.com> - 4.11.0-1
|
||||
- Update to 4.11.0
|
||||
|
||||
* Mon Aug 16 2021 Gabriel Féron <feron.gabriel@gmail.com> - 4.10.0-1
|
||||
- Update to 4.10.0
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Thu Jun 10 2021 Gabriel Féron <feron.gabriel@gmail.com> - 4.9.1-1
|
||||
- Update to 4.9.1
|
||||
|
||||
* Mon Apr 26 2021 Gabriel Féron <feron.gabriel@gmail.com> - 4.9.0-1
|
||||
- Update to 4.9.0
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Dec 23 2020 Jan Pazdziora <jpazdziora@redhat.com> - 4.8.0-1
|
||||
- Update to 4.8.0
|
||||
|
||||
* Thu Sep 03 2020 Miro Hrončok <mhroncok@redhat.com> - 4.7.1-1
|
||||
- Update to 4.7.1
|
||||
|
||||
* Mon Aug 31 2020 Gabriel Féron <feron.gabriel@gmail.com> - 4.7.0-1
|
||||
- Update to 4.7.0
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue May 5 2020 Gabriel Féron <feron.gabriel@gmail.com> - 4.6.0-1
|
||||
- Update to 4.6.1
|
||||
|
||||
* Tue Apr 21 2020 Gabriel Féron <feron.gabriel@gmail.com> - 4.6.0-1
|
||||
- Update to 4.6.0
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Nov 21 2019 Gabriel Féron <feron.gabriel@gmail.com> - 4.4.0-1
|
||||
- Update to 4.4.0
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Tue Jun 18 2019 Gabriel Féron <feron.gabriel@gmail.com> - 4.1.0-1
|
||||
- Update to 4.1.0
|
||||
|
||||
* Wed Apr 03 2019 Gabriel Féron <feron.gabriel@gmail.com> - 4.0.0-1
|
||||
- Update to 4.0.0
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Jan 26 2019 Gabriel Féron <feron.gabriel@gmail.com> - 3.6.0-1
|
||||
- Update to 3.6.0
|
||||
|
||||
* Mon Nov 12 2018 Miro Hrončok <mhroncok@redhat.com> - 3.5.1-1
|
||||
- Update to 3.5.1 (#1644323)
|
||||
|
||||
* Tue Aug 28 2018 Miro Hrončok <mhroncok@redhat.com> - 3.4.1-1
|
||||
- Update to 3.4.1 (#1599711)
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed May 02 2018 Miro Hrončok <mhroncok@redhat.com> - 3.3.0-1
|
||||
- Update to 3.3.0 (#1572931)
|
||||
|
||||
* Tue Mar 20 2018 Miro Hrončok <mhroncok@redhat.com> - 3.2.1-1
|
||||
- Update to 3.2.1 (#1523960)
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sun Dec 10 2017 Miro Hrončok <mhroncok@redhat.com> - 3.1.0-1
|
||||
- Update to 3.1.0 (#1523960)
|
||||
|
||||
* Mon Oct 23 2017 Miro Hrončok <mhroncok@redhat.com> - 3.0.3-1
|
||||
- Update to 3.0.3 (#1504321)
|
||||
|
||||
* Wed Aug 30 2017 Miro Hrončok <mhroncok@redhat.com> - 2.7.0-1
|
||||
- Update to 2.7.0 (#1486725)
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed Jun 28 2017 Miro Hrončok <mhroncok@redhat.com> - 2.6.1-1
|
||||
- New package
|
||||
|
|
@ -1,25 +1,19 @@
|
|||
Name: cura-fdm-materials
|
||||
Version: 5.4.0
|
||||
Release: %autorelease
|
||||
Version: 3.6.0
|
||||
Release: 2%{?dist}
|
||||
Summary: Cura FDM Material database
|
||||
|
||||
# See https://github.com/Ultimaker/Cura/issues/1779 for clarification
|
||||
License: LicenseRef-Fedora-Public-Domain
|
||||
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
|
||||
ExcludeArch: %{ix86}
|
||||
|
||||
BuildRequires: cmake
|
||||
Requires: cura >= 1:%{version}
|
||||
Requires: cura == 1:%{version}
|
||||
|
||||
%description
|
||||
Cura material files.
|
||||
|
|
@ -29,15 +23,12 @@ 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
|
||||
%{cmake} .
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
make install DESTDIR=%{buildroot}
|
||||
|
||||
|
||||
%files
|
||||
|
|
@ -45,4 +36,42 @@ cp %{SOURCE2} %{SOURCE3} .
|
|||
%{_datadir}/cura/resources/materials/
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Jan 26 2019 Gabriel Féron <feron.gabriel@gmail.com> - 3.6.0-1
|
||||
- Update to 3.6.0
|
||||
|
||||
* Mon Nov 12 2018 Miro Hrončok <mhroncok@redhat.com> - 3.5.1-1
|
||||
- Update to 3.5.1 (#1644323)
|
||||
|
||||
* Tue Aug 28 2018 Miro Hrončok <mhroncok@redhat.com> - 3.4.1-1
|
||||
- Update to 3.4.1 (#1599711)
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed May 02 2018 Miro Hrončok <mhroncok@redhat.com> - 3.3.0-1
|
||||
- Update to 3.3.0 (#1572931)
|
||||
|
||||
* Tue Mar 20 2018 Miro Hrončok <mhroncok@redhat.com> - 3.2.1-1
|
||||
- Update to 3.2.1 (#1523960)
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sun Dec 10 2017 Miro Hrončok <mhroncok@redhat.com> - 3.1.0-1
|
||||
- Update to 3.1.0 (#1523960)
|
||||
|
||||
* Mon Oct 23 2017 Miro Hrončok <mhroncok@redhat.com> - 3.0.3-1
|
||||
- Update to 3.0.3 (#1504321)
|
||||
|
||||
* Wed Aug 30 2017 Miro Hrončok <mhroncok@redhat.com> - 2.7.0-1
|
||||
- Update to 2.7.0 (#1486725)
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed Jun 28 2017 Miro Hrončok <mhroncok@redhat.com> - 2.6.1-1
|
||||
- New package
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (cura-fdm-materials-5.4.0.tar.gz) = 9cf2b1b9ac635e987f0c1679b1e3153b5acd853257b9e175fb6ffff02dac9ea630088fa864c2c3908a293fb845b6f3f1c7e9bbf46e63d17d9fdbe4525d2cf5d6
|
||||
SHA512 (cura-fdm-materials-3.6.0.tar.gz) = 1f868b716135a3b81495ed6445794c4d5cddc618dbf7a19b29ccdddbcd1d6f9d49190be7cea99c6dd2b8c07f1126973f1c43b223ff213ce04b6fe8811c71a577
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue