From f1936708b580d8fc15af25f7ddb3e0eb31f25986 Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Wed, 8 Jul 2020 11:49:56 +0200 Subject: [PATCH 01/21] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- vmmlib.spec | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/vmmlib.spec b/vmmlib.spec index f06e9bf..444018a 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -1,3 +1,4 @@ +%undefine __cmake_in_source_build %global git_commit 925a709ba0c98d8c0beabd0e34477971946c10be %global git_date 20140319 @@ -44,15 +45,11 @@ culling classes, and spatial data structures. %setup %build -mkdir build -cd build -%cmake .. -make %{?_smp_mflags} +%cmake +%cmake_build %install -pushd build -make install DESTDIR=%{buildroot} -popd +%cmake_install # move docs to right place mkdir _tmpdoc @@ -64,8 +61,7 @@ mv %{buildroot}%{_datadir}/%{name}/CMake/*.cmake %{buildroot}%{_datadir}/cmake/M rmdir %{buildroot}%{_datadir}/%{name}/CMake %check -cd build -make test +%ctest %files devel %doc RELNOTES.md CHANGES _tmpdoc/* From 13d4994c14e694b69181549bfc95401bfc4cae5c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:49:57 +0000 Subject: [PATCH 02/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vmmlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vmmlib.spec b/vmmlib.spec index 444018a..3e4ab01 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -12,7 +12,7 @@ Name: vmmlib Version: 1.6.2 -Release: 12.%{git_suffix}%{?dist} +Release: 13.%{git_suffix}%{?dist} Summary: A vector and matrix math library implemented using C++ templates License: BSD #URL: http://vmmlib.sourceforge.net/ @@ -70,6 +70,9 @@ rmdir %{buildroot}%{_datadir}/%{name}/CMake %{_datadir}/cmake/Modules/vmmlib*.cmake %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.6.2-13.20140319git925a709b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 1.6.2-12.20140319git925a709b - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From d10637f2417dccfbd0e4102fc0fedfd46b9ea6eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= Date: Thu, 27 Aug 2020 19:53:48 +0200 Subject: [PATCH 03/21] https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager --- 0001-remove-lapack-tests.patch | 57 ++++++++++++++++++++++++++++++++++ vmmlib.spec | 21 ++++++++++--- 2 files changed, 74 insertions(+), 4 deletions(-) create mode 100644 0001-remove-lapack-tests.patch diff --git a/0001-remove-lapack-tests.patch b/0001-remove-lapack-tests.patch new file mode 100644 index 0000000..d19959a --- /dev/null +++ b/0001-remove-lapack-tests.patch @@ -0,0 +1,57 @@ +From b3ea45d53845dc307e3d58333a076f595369dcd9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= +Date: Thu, 27 Aug 2020 19:49:38 +0200 +Subject: [PATCH] remove lapack tests + +--- + CMakeLists.txt | 34 ---------------------------------- + 1 file changed, 34 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8cf6f5c..dc62a45 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -166,40 +166,6 @@ set(TESTS + # tests/vmmlib_lapack_main.cpp + # tests/vmmlib_performance_tests_main.cpp + ) +-if(LAPACK_FOUND) +- set(LAPACK_HEADERS +- include/vmmlib/lapack/detail/clapack.h +- include/vmmlib/lapack/detail/f2c.h ) +- add_definitions(-DVMMLIB_USE_LAPACK) +- list(APPEND TESTS +- tests/blas_daxpy_test.cpp +- tests/blas_dgemm_test.cpp +- tests/blas_dot_test.cpp +- tests/cp3_tensor_test.cpp +- tests/lapack_gaussian_elimination_test.cpp +- tests/lapack_linear_least_squares_test.cpp +- tests/lapack_svd_test.cpp +- tests/lapack_sym_eigs_test.cpp +- tests/matrix_pseudoinverse_test.cpp +- tests/qtucker3_tensor_test.cpp +- tests/svd_lapack_vs_old.cpp +- tests/t3_hooi_test.cpp +- tests/t3_hopm_test.cpp +- tests/t3_hosvd_test.cpp +- tests/t3_ihooi_test.cpp +- tests/t3_ihopm_test.cpp +- tests/t3_ttm_test.cpp +- tests/tensor3_iterator_test.cpp +- tests/tensor3_test.cpp +- tests/tucker3_exporter_importer_test.cpp +- tests/tucker3_tensor_test.cpp +- tests/t4_hooi_test.cpp +- tests/t4_converter_test.cpp +- tests/tensor4_test.cpp +- tests/t4_ttm_test.cpp +- +-) +-endif() + + if(BLAS_FOUND) + add_definitions(-DVMMLIB_USE_BLAS) +-- +2.25.2 + diff --git a/vmmlib.spec b/vmmlib.spec index 3e4ab01..37db38e 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -5,6 +5,12 @@ %global git_short_commit %(echo %{git_commit} | cut -c -8) %global git_suffix %{git_date}git%{git_short_commit} +%if 0%{?fedora} >= 33 +%global blaslib flexiblas +%else +%global blaslib openblas +%endif + # git clone https://github.com/VMML/vmmlib.git # cd %%{name} # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ @@ -12,15 +18,17 @@ Name: vmmlib Version: 1.6.2 -Release: 13.%{git_suffix}%{?dist} +Release: 14.%{git_suffix}%{?dist} Summary: A vector and matrix math library implemented using C++ templates License: BSD #URL: http://vmmlib.sourceforge.net/ URL: http://github.com/VMML/vmmlib/ #Source0: http://github.com/VMML/vmmlib/archive/release-%{version}.tar.gz#/%{name}-release-%{version}.tar.gz Source0: %{name}-%{version}-%{git_suffix}.tar.bz2 +# BLAS/LAPACK tests are broken +Patch0: 0001-remove-lapack-tests.patch BuildArch: noarch -BuildRequires: atlas-devel, lapack-devel, blas-devel, f2c, gcc-c++ +BuildRequires: %{blaslib}-devel, f2c, gcc-c++ BuildRequires: doxygen, cmake %description @@ -42,10 +50,11 @@ More advanced functionality include solvers, frustum computations and frustum culling classes, and spatial data structures. %prep -%setup +%autosetup -p1 %build -%cmake +export CXXFLAGS="$CXXFLAGS -I%{_includedir}/%{blaslib}" +%cmake -DBLAS_FOUND=TRUE -DLAPACK_FOUND=TRUE -DBLAS_LIBRARIES=-l%{blaslib} %cmake_build %install @@ -61,6 +70,7 @@ mv %{buildroot}%{_datadir}/%{name}/CMake/*.cmake %{buildroot}%{_datadir}/cmake/M rmdir %{buildroot}%{_datadir}/%{name}/CMake %check +export FLEXIBLAS=netlib %ctest %files devel @@ -70,6 +80,9 @@ rmdir %{buildroot}%{_datadir}/%{name}/CMake %{_datadir}/cmake/Modules/vmmlib*.cmake %changelog +* Thu Aug 27 2020 Iñaki Úcar - 1.6.2-14.20140319git925a709b +- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager + * Wed Jul 29 2020 Fedora Release Engineering - 1.6.2-13.20140319git925a709b - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 696fc33367e8fcc48a331e268cf9315493ccc043 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:11:33 +0000 Subject: [PATCH 04/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vmmlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vmmlib.spec b/vmmlib.spec index 37db38e..5a446d3 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -18,7 +18,7 @@ Name: vmmlib Version: 1.6.2 -Release: 14.%{git_suffix}%{?dist} +Release: 15.%{git_suffix}%{?dist} Summary: A vector and matrix math library implemented using C++ templates License: BSD #URL: http://vmmlib.sourceforge.net/ @@ -80,6 +80,9 @@ export FLEXIBLAS=netlib %{_datadir}/cmake/Modules/vmmlib*.cmake %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.6.2-15.20140319git925a709b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Aug 27 2020 Iñaki Úcar - 1.6.2-14.20140319git925a709b - https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager From c0c86e33972cc6ad90d2a4d665a1c31730a7e638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 13 Jul 2021 20:42:29 +0200 Subject: [PATCH 05/21] Properly set BLA_VENDOR to FlexiBLAS for cmake >= 3.19 --- vmmlib.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/vmmlib.spec b/vmmlib.spec index 5a446d3..0d5b7de 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -5,10 +5,13 @@ %global git_short_commit %(echo %{git_commit} | cut -c -8) %global git_suffix %{git_date}git%{git_short_commit} -%if 0%{?fedora} >= 33 +%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 %global blaslib flexiblas +%global cmake_blas_flags -DBLA_VENDOR=FlexiBLAS %else %global blaslib openblas +%global blasvar o +%global cmake_blas_flags -DBLAS_FOUND=TRUE -DLAPACK_FOUND=TRUE -DBLAS_LIBRARIES=%{_libdir}/lib%{blaslib}%{blasvar}.so %endif # git clone https://github.com/VMML/vmmlib.git @@ -18,7 +21,7 @@ Name: vmmlib Version: 1.6.2 -Release: 15.%{git_suffix}%{?dist} +Release: 16.%{git_suffix}%{?dist} Summary: A vector and matrix math library implemented using C++ templates License: BSD #URL: http://vmmlib.sourceforge.net/ @@ -53,8 +56,8 @@ culling classes, and spatial data structures. %autosetup -p1 %build -export CXXFLAGS="$CXXFLAGS -I%{_includedir}/%{blaslib}" -%cmake -DBLAS_FOUND=TRUE -DLAPACK_FOUND=TRUE -DBLAS_LIBRARIES=-l%{blaslib} +export CXXFLAGS="%{optflags} -I%{_includedir}/%{blaslib}" +%cmake %{cmake_blas_flags} %cmake_build %install @@ -80,6 +83,9 @@ export FLEXIBLAS=netlib %{_datadir}/cmake/Modules/vmmlib*.cmake %changelog +* Tue Jul 13 2021 Björn Esser - 1.6.2-16.20140319git925a709b +- Properly set BLA_VENDOR to FlexiBLAS for cmake >= 3.19 + * Wed Jan 27 2021 Fedora Release Engineering - 1.6.2-15.20140319git925a709b - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 1df0b628c58fe6c0c15ccca81b93ae3c79c4c9b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:36:33 +0000 Subject: [PATCH 06/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vmmlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vmmlib.spec b/vmmlib.spec index 0d5b7de..8899500 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -21,7 +21,7 @@ Name: vmmlib Version: 1.6.2 -Release: 16.%{git_suffix}%{?dist} +Release: 17.%{git_suffix}%{?dist} Summary: A vector and matrix math library implemented using C++ templates License: BSD #URL: http://vmmlib.sourceforge.net/ @@ -83,6 +83,9 @@ export FLEXIBLAS=netlib %{_datadir}/cmake/Modules/vmmlib*.cmake %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.6.2-17.20140319git925a709b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jul 13 2021 Björn Esser - 1.6.2-16.20140319git925a709b - Properly set BLA_VENDOR to FlexiBLAS for cmake >= 3.19 From 61d1f6303f718896dcd561b9cb2633a32e07c425 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:07:15 +0000 Subject: [PATCH 07/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vmmlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vmmlib.spec b/vmmlib.spec index 8899500..58dbb21 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -21,7 +21,7 @@ Name: vmmlib Version: 1.6.2 -Release: 17.%{git_suffix}%{?dist} +Release: 18.%{git_suffix}%{?dist} Summary: A vector and matrix math library implemented using C++ templates License: BSD #URL: http://vmmlib.sourceforge.net/ @@ -83,6 +83,9 @@ export FLEXIBLAS=netlib %{_datadir}/cmake/Modules/vmmlib*.cmake %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.6.2-18.20140319git925a709b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.6.2-17.20140319git925a709b - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 932e918fdd5a673fdf037594420dc48185b0c3d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 22 Feb 2022 22:12:41 +0100 Subject: [PATCH 08/21] New version Resolves: rhbz#2047102 --- .gitignore | 4 +-- 0001-remove-lapack-tests.patch | 57 ------------------------------ sources | 2 +- vmmlib.spec | 64 ++++++++++++---------------------- 4 files changed, 25 insertions(+), 102 deletions(-) delete mode 100644 0001-remove-lapack-tests.patch diff --git a/.gitignore b/.gitignore index 51972d6..b8db472 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -vmmlib-*.tar.xz -vmmlib_*.tgz -/vmmlib-1.6.2-20140319git925a709b.tar.bz2 +/vmmlib-*.tar.gz diff --git a/0001-remove-lapack-tests.patch b/0001-remove-lapack-tests.patch deleted file mode 100644 index d19959a..0000000 --- a/0001-remove-lapack-tests.patch +++ /dev/null @@ -1,57 +0,0 @@ -From b3ea45d53845dc307e3d58333a076f595369dcd9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= -Date: Thu, 27 Aug 2020 19:49:38 +0200 -Subject: [PATCH] remove lapack tests - ---- - CMakeLists.txt | 34 ---------------------------------- - 1 file changed, 34 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8cf6f5c..dc62a45 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -166,40 +166,6 @@ set(TESTS - # tests/vmmlib_lapack_main.cpp - # tests/vmmlib_performance_tests_main.cpp - ) --if(LAPACK_FOUND) -- set(LAPACK_HEADERS -- include/vmmlib/lapack/detail/clapack.h -- include/vmmlib/lapack/detail/f2c.h ) -- add_definitions(-DVMMLIB_USE_LAPACK) -- list(APPEND TESTS -- tests/blas_daxpy_test.cpp -- tests/blas_dgemm_test.cpp -- tests/blas_dot_test.cpp -- tests/cp3_tensor_test.cpp -- tests/lapack_gaussian_elimination_test.cpp -- tests/lapack_linear_least_squares_test.cpp -- tests/lapack_svd_test.cpp -- tests/lapack_sym_eigs_test.cpp -- tests/matrix_pseudoinverse_test.cpp -- tests/qtucker3_tensor_test.cpp -- tests/svd_lapack_vs_old.cpp -- tests/t3_hooi_test.cpp -- tests/t3_hopm_test.cpp -- tests/t3_hosvd_test.cpp -- tests/t3_ihooi_test.cpp -- tests/t3_ihopm_test.cpp -- tests/t3_ttm_test.cpp -- tests/tensor3_iterator_test.cpp -- tests/tensor3_test.cpp -- tests/tucker3_exporter_importer_test.cpp -- tests/tucker3_tensor_test.cpp -- tests/t4_hooi_test.cpp -- tests/t4_converter_test.cpp -- tests/tensor4_test.cpp -- tests/t4_ttm_test.cpp -- --) --endif() - - if(BLAS_FOUND) - add_definitions(-DVMMLIB_USE_BLAS) --- -2.25.2 - diff --git a/sources b/sources index 3db5eda..8b098de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0587926760e48106a975270e0951a721 vmmlib-1.6.2-20140319git925a709b.tar.bz2 +SHA512 (vmmlib-1.8.0-20220222git364732e3.tar.gz) = 3d6a31739a183848b5a665eda71a34ac99e63047d62a308104a1c893de18ea76bb27434dc0dec9f57623217c56b90722c5515408a8bd1b88c0dd15906ce12dfe diff --git a/vmmlib.spec b/vmmlib.spec index 58dbb21..6c0c778 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -1,38 +1,23 @@ -%undefine __cmake_in_source_build -%global git_commit 925a709ba0c98d8c0beabd0e34477971946c10be -%global git_date 20140319 +%global git_commit 364732e348679893686ae46e8747cb17b0656d86 +%global git_date 20220222 %global git_short_commit %(echo %{git_commit} | cut -c -8) %global git_suffix %{git_date}git%{git_short_commit} -%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 -%global blaslib flexiblas -%global cmake_blas_flags -DBLA_VENDOR=FlexiBLAS -%else -%global blaslib openblas -%global blasvar o -%global cmake_blas_flags -DBLAS_FOUND=TRUE -DLAPACK_FOUND=TRUE -DBLAS_LIBRARIES=%{_libdir}/lib%{blaslib}%{blasvar}.so -%endif - -# git clone https://github.com/VMML/vmmlib.git -# cd %%{name} -# git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ -# bzip2 > ../%%{name}-%%{version}-%%{git_suffix}.tar.bz2 - Name: vmmlib -Version: 1.6.2 -Release: 18.%{git_suffix}%{?dist} +Version: 1.8.0 +Release: 0.1.%{git_suffix}%{?dist} Summary: A vector and matrix math library implemented using C++ templates License: BSD #URL: http://vmmlib.sourceforge.net/ URL: http://github.com/VMML/vmmlib/ -#Source0: http://github.com/VMML/vmmlib/archive/release-%{version}.tar.gz#/%{name}-release-%{version}.tar.gz -Source0: %{name}-%{version}-%{git_suffix}.tar.bz2 -# BLAS/LAPACK tests are broken -Patch0: 0001-remove-lapack-tests.patch +#Source0: http://github.com/VMML/vmmlib/archive/release-%%{version}.tar.gz#/%%{name}-release-%%{version}.tar.gz +Source0: %{url}/archive/%{git_commit}/%{name}-%{version}-%{git_suffix}.tar.gz BuildArch: noarch -BuildRequires: %{blaslib}-devel, f2c, gcc-c++ -BuildRequires: doxygen, cmake +BuildRequires: gcc-c++ +BuildRequires: doxygen +BuildRequires: cmake +BuildRequires: boost-devel %description vmmlib is a vector and matrix math library implemented using C++ templates. @@ -53,36 +38,33 @@ More advanced functionality include solvers, frustum computations and frustum culling classes, and spatial data structures. %prep -%autosetup -p1 +%autosetup -p1 -n %{name}-%{git_commit} %build -export CXXFLAGS="%{optflags} -I%{_includedir}/%{blaslib}" -%cmake %{cmake_blas_flags} +%cmake %cmake_build %install %cmake_install - -# move docs to right place -mkdir _tmpdoc -mv %{buildroot}%{_datadir}/%{name}/{AUTHORS,LICENSE.txt,ACKNOWLEDGEMENTS,README.md} _tmpdoc/ - -# move cmake files to right place -mkdir -p %{buildroot}%{_datadir}/cmake/Modules/ -mv %{buildroot}%{_datadir}/%{name}/CMake/*.cmake %{buildroot}%{_datadir}/cmake/Modules/ -rmdir %{buildroot}%{_datadir}/%{name}/CMake +rm -r %{buildroot}%{_datadir}/vmmlib/tests/* +rmdir %{buildroot}%{_datadir}/vmmlib/tests +mkdir -p %{buildroot}%{_includedir} +cp -a vmmlib %{buildroot}%{_includedir} %check -export FLEXIBLAS=netlib %ctest %files devel -%doc RELNOTES.md CHANGES _tmpdoc/* +%license LICENSE.txt +%doc doc/RELNOTES.md CHANGES README.md AUTHORS ACKNOWLEDGEMENTS %{_includedir}/vmmlib -%{_libdir}/pkgconfig/vmmlib.pc -%{_datadir}/cmake/Modules/vmmlib*.cmake +%{_datadir}/vmmlib/CMake/*.cmake %changelog +* Tue Feb 22 2022 Jaroslav Škarvada - 1.8.0-0.1.20220222git364732e3 +- New version + Resolves: rhbz#2047102 + * Sat Jan 22 2022 Fedora Release Engineering - 1.6.2-18.20140319git925a709b - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From f87b06fd55bf3820f3c09d8dfac89da58b41e502 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:03:02 +0000 Subject: [PATCH 09/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vmmlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vmmlib.spec b/vmmlib.spec index 6c0c778..db0840c 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -6,7 +6,7 @@ Name: vmmlib Version: 1.8.0 -Release: 0.1.%{git_suffix}%{?dist} +Release: 0.2.%{git_suffix}%{?dist} Summary: A vector and matrix math library implemented using C++ templates License: BSD #URL: http://vmmlib.sourceforge.net/ @@ -61,6 +61,9 @@ cp -a vmmlib %{buildroot}%{_includedir} %{_datadir}/vmmlib/CMake/*.cmake %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.8.0-0.2.20220222git364732e3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Feb 22 2022 Jaroslav Škarvada - 1.8.0-0.1.20220222git364732e3 - New version Resolves: rhbz#2047102 From 45b1ae399fe007c285eff0bfe1229ecc135d15cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:26:38 +0000 Subject: [PATCH 10/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vmmlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vmmlib.spec b/vmmlib.spec index db0840c..39a4084 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -6,7 +6,7 @@ Name: vmmlib Version: 1.8.0 -Release: 0.2.%{git_suffix}%{?dist} +Release: 0.3.%{git_suffix}%{?dist} Summary: A vector and matrix math library implemented using C++ templates License: BSD #URL: http://vmmlib.sourceforge.net/ @@ -61,6 +61,9 @@ cp -a vmmlib %{buildroot}%{_includedir} %{_datadir}/vmmlib/CMake/*.cmake %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.8.0-0.3.20220222git364732e3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 1.8.0-0.2.20220222git364732e3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 762d18bc7905d2bdb9cb769b784cfdba157cee53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 23 Feb 2023 15:11:50 +0100 Subject: [PATCH 11/21] Fixed FTBFS with gcc-13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves: rhbz#2171754 Signed-off-by: Jaroslav Škarvada --- vmmlib-1.8.0-gcc-13-fix.patch | 12 ++++++++++++ vmmlib.spec | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 vmmlib-1.8.0-gcc-13-fix.patch diff --git a/vmmlib-1.8.0-gcc-13-fix.patch b/vmmlib-1.8.0-gcc-13-fix.patch new file mode 100644 index 0000000..1431661 --- /dev/null +++ b/vmmlib-1.8.0-gcc-13-fix.patch @@ -0,0 +1,12 @@ +diff --git a/vmmlib/vector.hpp b/vmmlib/vector.hpp +index 4adc2de..dfbf9fb 100644 +--- a/vmmlib/vector.hpp ++++ b/vmmlib/vector.hpp +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + + namespace vmml + { diff --git a/vmmlib.spec b/vmmlib.spec index 39a4084..b5f3a30 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -18,6 +18,8 @@ BuildRequires: gcc-c++ BuildRequires: doxygen BuildRequires: cmake BuildRequires: boost-devel +# https://github.com/VMML/vmmlib/pull/101 +Patch0: vmmlib-1.8.0-gcc-13-fix.patch %description vmmlib is a vector and matrix math library implemented using C++ templates. From 03e815cd4fcbe637adcbb06bf81d410d3b8370f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:48:12 +0000 Subject: [PATCH 12/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vmmlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vmmlib.spec b/vmmlib.spec index b5f3a30..69caa8e 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -6,7 +6,7 @@ Name: vmmlib Version: 1.8.0 -Release: 0.3.%{git_suffix}%{?dist} +Release: 0.4.%{git_suffix}%{?dist} Summary: A vector and matrix math library implemented using C++ templates License: BSD #URL: http://vmmlib.sourceforge.net/ @@ -63,6 +63,9 @@ cp -a vmmlib %{buildroot}%{_includedir} %{_datadir}/vmmlib/CMake/*.cmake %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.8.0-0.4.20220222git364732e3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 1.8.0-0.3.20220222git364732e3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From c35a1a9cbb62b2ad83572a588656305524e9402a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:05:48 +0000 Subject: [PATCH 13/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- vmmlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vmmlib.spec b/vmmlib.spec index 69caa8e..217744d 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -6,7 +6,7 @@ Name: vmmlib Version: 1.8.0 -Release: 0.4.%{git_suffix}%{?dist} +Release: 0.5.%{git_suffix}%{?dist} Summary: A vector and matrix math library implemented using C++ templates License: BSD #URL: http://vmmlib.sourceforge.net/ @@ -63,6 +63,9 @@ cp -a vmmlib %{buildroot}%{_includedir} %{_datadir}/vmmlib/CMake/*.cmake %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.8.0-0.5.20220222git364732e3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.8.0-0.4.20220222git364732e3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 7f6b4cc04407ff435aca37b14b2b72c2514468ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:56:53 +0000 Subject: [PATCH 14/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- vmmlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vmmlib.spec b/vmmlib.spec index 217744d..551f1b1 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -6,7 +6,7 @@ Name: vmmlib Version: 1.8.0 -Release: 0.5.%{git_suffix}%{?dist} +Release: 0.6.%{git_suffix}%{?dist} Summary: A vector and matrix math library implemented using C++ templates License: BSD #URL: http://vmmlib.sourceforge.net/ @@ -63,6 +63,9 @@ cp -a vmmlib %{buildroot}%{_includedir} %{_datadir}/vmmlib/CMake/*.cmake %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.8.0-0.6.20220222git364732e3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1.8.0-0.5.20220222git364732e3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 14b590bbfe38fd2a00841cf984727a962d58b2fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:41:54 +0200 Subject: [PATCH 15/21] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- vmmlib.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vmmlib.spec b/vmmlib.spec index 551f1b1..e5862b6 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -6,9 +6,10 @@ Name: vmmlib Version: 1.8.0 -Release: 0.6.%{git_suffix}%{?dist} +Release: 0.7.%{git_suffix}%{?dist} Summary: A vector and matrix math library implemented using C++ templates -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD #URL: http://vmmlib.sourceforge.net/ URL: http://github.com/VMML/vmmlib/ #Source0: http://github.com/VMML/vmmlib/archive/release-%%{version}.tar.gz#/%%{name}-release-%%{version}.tar.gz @@ -63,6 +64,9 @@ cp -a vmmlib %{buildroot}%{_includedir} %{_datadir}/vmmlib/CMake/*.cmake %changelog +* Wed Sep 04 2024 Miroslav Suchý - 1.8.0-0.7.20220222git364732e3 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 1.8.0-0.6.20220222git364732e3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 7479aec431b97ec7abdb6f6bac6cf8580a0d56b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:32:48 +0000 Subject: [PATCH 16/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- vmmlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vmmlib.spec b/vmmlib.spec index e5862b6..98849a4 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -6,7 +6,7 @@ Name: vmmlib Version: 1.8.0 -Release: 0.7.%{git_suffix}%{?dist} +Release: 0.8.%{git_suffix}%{?dist} Summary: A vector and matrix math library implemented using C++ templates # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -64,6 +64,9 @@ cp -a vmmlib %{buildroot}%{_includedir} %{_datadir}/vmmlib/CMake/*.cmake %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.8.0-0.8.20220222git364732e3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Sep 04 2024 Miroslav Suchý - 1.8.0-0.7.20220222git364732e3 - convert license to SPDX From c84a41b8adeabcfd0f8985c2b6b704f9ef5170c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:11:22 +0000 Subject: [PATCH 17/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- vmmlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vmmlib.spec b/vmmlib.spec index 98849a4..660a636 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -6,7 +6,7 @@ Name: vmmlib Version: 1.8.0 -Release: 0.8.%{git_suffix}%{?dist} +Release: 0.9.%{git_suffix}%{?dist} Summary: A vector and matrix math library implemented using C++ templates # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -64,6 +64,9 @@ cp -a vmmlib %{buildroot}%{_includedir} %{_datadir}/vmmlib/CMake/*.cmake %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.8.0-0.9.20220222git364732e3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 1.8.0-0.8.20220222git364732e3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From c7dedb0da5fefb66ff014e4bb73e9346867ff03d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 13 Jan 2026 17:05:22 +0100 Subject: [PATCH 18/21] Fixed build with cmake-4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- vmmlib-1.8.0-cmake-4-fix.patch | 13 +++++++++++++ vmmlib.spec | 4 +++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 vmmlib-1.8.0-cmake-4-fix.patch diff --git a/vmmlib-1.8.0-cmake-4-fix.patch b/vmmlib-1.8.0-cmake-4-fix.patch new file mode 100644 index 0000000..a8f1876 --- /dev/null +++ b/vmmlib-1.8.0-cmake-4-fix.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f5498c8..eedffe0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,7 @@ + # Copyright (c) 2011 Daniel Pfeifer + # 2011-2014 Stefan.Eilemann@epfl.ch + +-cmake_minimum_required(VERSION 2.8 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.5 FATAL_ERROR) + project(vmmlib) + + set(VERSION_MAJOR 1) diff --git a/vmmlib.spec b/vmmlib.spec index 660a636..0312774 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -20,7 +20,9 @@ BuildRequires: doxygen BuildRequires: cmake BuildRequires: boost-devel # https://github.com/VMML/vmmlib/pull/101 -Patch0: vmmlib-1.8.0-gcc-13-fix.patch +Patch: vmmlib-1.8.0-gcc-13-fix.patch +# https://github.com/VMML/vmmlib/issues/103 +Patch: vmmlib-1.8.0-cmake-4-fix.patch %description vmmlib is a vector and matrix math library implemented using C++ templates. From d4142ddb0324c55f5804dbeef97fa172293493d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 13 Jan 2026 18:34:12 +0100 Subject: [PATCH 19/21] More fixes for cmake-4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- vmmlib-1.8.0-cmake-4-fix.patch | 13 +++++++++++++ vmmlib.spec | 1 + 2 files changed, 14 insertions(+) diff --git a/vmmlib-1.8.0-cmake-4-fix.patch b/vmmlib-1.8.0-cmake-4-fix.patch index a8f1876..ab64bf5 100644 --- a/vmmlib-1.8.0-cmake-4-fix.patch +++ b/vmmlib-1.8.0-cmake-4-fix.patch @@ -1,3 +1,16 @@ +diff --git a/CMake/common/Common.cmake b/CMake/common/Common.cmake +index 833201e..4b103f0 100644 +--- a/CMake/common/Common.cmake ++++ b/CMake/common/Common.cmake +@@ -12,7 +12,7 @@ if(CMAKE_INSTALL_PREFIX STREQUAL PROJECT_BINARY_DIR) + message(FATAL_ERROR "Cannot install into build directory") + endif() + +-cmake_minimum_required(VERSION 2.8 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.5 FATAL_ERROR) + include(CMakeCompatibility) + + if(EXISTS ${PROJECT_SOURCE_DIR}/CMake/${PROJECT_NAME}.cmake) diff --git a/CMakeLists.txt b/CMakeLists.txt index f5498c8..eedffe0 100644 --- a/CMakeLists.txt diff --git a/vmmlib.spec b/vmmlib.spec index 0312774..00127b8 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -22,6 +22,7 @@ BuildRequires: boost-devel # https://github.com/VMML/vmmlib/pull/101 Patch: vmmlib-1.8.0-gcc-13-fix.patch # https://github.com/VMML/vmmlib/issues/103 +# https://github.com/Eyescale/CMake/pull/606 Patch: vmmlib-1.8.0-cmake-4-fix.patch %description From 0fbc29a576493315f6ee791f81ee8b88342035cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:01:02 +0000 Subject: [PATCH 20/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- vmmlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vmmlib.spec b/vmmlib.spec index 00127b8..3974acd 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -6,7 +6,7 @@ Name: vmmlib Version: 1.8.0 -Release: 0.9.%{git_suffix}%{?dist} +Release: 0.10.%{git_suffix}%{?dist} Summary: A vector and matrix math library implemented using C++ templates # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -67,6 +67,9 @@ cp -a vmmlib %{buildroot}%{_includedir} %{_datadir}/vmmlib/CMake/*.cmake %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.8.0-0.10.20220222git364732e3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 1.8.0-0.9.20220222git364732e3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 1603b9357555074f1282270bf8bfd409a82ef0a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:35:11 +0000 Subject: [PATCH 21/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- vmmlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vmmlib.spec b/vmmlib.spec index 3974acd..20513c2 100644 --- a/vmmlib.spec +++ b/vmmlib.spec @@ -6,7 +6,7 @@ Name: vmmlib Version: 1.8.0 -Release: 0.10.%{git_suffix}%{?dist} +Release: 0.11.%{git_suffix}%{?dist} Summary: A vector and matrix math library implemented using C++ templates # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -67,6 +67,9 @@ cp -a vmmlib %{buildroot}%{_includedir} %{_datadir}/vmmlib/CMake/*.cmake %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.8.0-0.11.20220222git364732e3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 1.8.0-0.10.20220222git364732e3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild