From ab13b57138aaf28877f1990fbe12ffbc3b063855 Mon Sep 17 00:00:00 2001 From: Ryan Curtin Date: May 27 2022 14:09:13 +0000 Subject: Merge branch 'rawhide' into epel8 --- diff --git a/.gitignore b/.gitignore index dce4109..ddd5d7d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -clog -/armadillo-9.600.6.tar.xz -/armadillo-9.700.2.tar.xz +/armadillo-10.7.4.tar.xz +/armadillo-10.8.2.tar.xz diff --git a/armadillo.spec b/armadillo.spec index b2393f5..bc7ee99 100644 --- a/armadillo.spec +++ b/armadillo.spec @@ -1,7 +1,7 @@ -Name: armadillo -Version: 9.700.2 -Release: 1%{?dist} -Summary: Fast C++ matrix library with syntax similar to MATLAB and Octave +Name: armadillo +Version: 10.8.2 +Release: 1%{?dist} +Summary: Fast C++ matrix library with syntax similar to MATLAB and Octave License: ASL 2.0 URL: http://arma.sourceforge.net/ @@ -13,17 +13,29 @@ Source: http://sourceforge.net/projects/arma/files/%{name}-%{version}.tar.xz %define old_epel 0 %endif -BuildRequires: gcc-c++ -BuildRequires: cmake, lapack-devel, arpack-devel +BuildRequires: gcc-c++ +BuildRequires: cmake +BuildRequires: make +BuildRequires: arpack-devel %if %{old_epel} == 0 BuildRequires: hdf5-devel %endif +BuildRequires: SuperLU-devel + +# flexiblas is only available on Fedora, for EPEL replace it by atlas, lapack and openblas +%if %{?fedora} +%global extra_options -DALLOW_FLEXIBLAS_LINUX=ON +BuildRequires: flexiblas-devel +%else +%undefine __cmake_in_source_build +%global extra_options %{nil} +BuildRequires: atlas-devel +BuildRequires: lapack-devel %{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64} %ifarch %{openblas_arches} BuildRequires: openblas-devel %endif -BuildRequires: SuperLU-devel atlas-devel - +%endif %description Armadillo is a C++ linear algebra library (matrix maths) @@ -42,16 +54,24 @@ than another language like Matlab or Octave. %package devel -Summary: Development headers and documentation for the Armadillo C++ library -Requires: %{name} = %{version}-%{release} -Requires: lapack-devel, arpack-devel, libstdc++-devel +Summary: Development headers and documentation for the Armadillo C++ library +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: libstdc++-devel +Requires: arpack-devel %if %{old_epel} == 0 Requires: hdf5-devel %endif +Requires: SuperLU-devel + +%if %{?fedora} +Requires: flexiblas-devel +%else +Requires: atlas-devel +Requires: lapack-devel %ifarch %{openblas_arches} -Requires: openblas-devel +Requires: openblas-devel +%endif %endif -Requires: SuperLU-devel atlas-devel %description devel @@ -61,37 +81,27 @@ and user documentation (API reference guide). %prep -%setup -q - -# convert DOS end-of-line to UNIX end-of-line - -for file in README.md; do - sed 's/\r//' $file >$file.new && \ - touch -r $file $file.new && \ - mv $file.new $file -done +%autosetup -p1 +sed -i 's/\r//' README.md +rm -rf examples/*win64* %build -%if %{old_epel} == 1 -%{cmake} -DDETECT_HDF5=OFF . -%else -%{cmake} -%endif -%{__make} VERBOSE=1 %{?_smp_mflags} +%cmake %{extra_options} +%cmake_build %install -%{__rm} -rf $RPM_BUILD_ROOT -%{__make} install DESTDIR=$RPM_BUILD_ROOT -%{__rm} -f examples/Makefile.cmake -%{__rm} -f examples/example1_win64.sln -%{__rm} -f examples/example1_win64.vcxproj -%{__rm} -f examples/example1_win64.README.txt -%{__rm} -rf examples/lib_win64 +%cmake_install + + +%check +%cmake %{extra_options} -DBUILD_SMOKE_TEST=ON +make -C "%{_vpath_builddir}" +%ctest -%if ((0%{?rhel} && 0%{?rhel} <= 7) || (0%{?fedora} && 0%{?fedora} < 28)) +%if (0%{?rhel} && 0%{?rhel} <= 7) %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -99,7 +109,7 @@ done %files -%{_libdir}/libarmadillo.so.9* +%{_libdir}/libarmadillo.so.10* %license LICENSE.txt NOTICE.txt %files devel @@ -108,14 +118,108 @@ done %{_includedir}/armadillo %{_includedir}/armadillo_bits/ %{_datadir}/Armadillo/ -%doc README.md index.html docs.html -%doc examples armadillo_icon.png -%doc armadillo_nicta_2010.pdf rcpp_armadillo_csda_2014.pdf -%doc armadillo_joss_2016.pdf armadillo_mca_2019.pdf +%doc README.md +%doc index.html +%doc docs.html +%doc examples +%doc armadillo_icon.png %doc mex_interface +%doc armadillo_nicta_2010.pdf +%doc rcpp_armadillo_csda_2014.pdf +%doc armadillo_joss_2016.pdf +%doc armadillo_spcs_2017.pdf +%doc armadillo_lncs_2018.pdf +%doc armadillo_solver_2020.pdf %changelog +* Thu Feb 3 2022 José Matos - 10.8.2-1 +- update to 10.8.2 + +* Wed Jan 19 2022 Fedora Release Engineering - 10.7.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Nov 27 2021 José Matos - 10.7.4-1 +- Update to 10.7.4 + +* Mon Nov 22 2021 Orion Poplawski - 10.6.0-7 +- Rebuild to tag build + +* Sun Nov 21 2021 Orion Poplawski - 10.6.0-6 +- Rebuild for hdf5 1.12.1 + +* Sat Oct 30 2021 Antoio Trande - 10.6.0-5 +- Rebuild for SuperLU-5.3.0 + +* Tue Aug 10 2021 Orion Poplawski - 10.6.0-4 +- Rebuild for hdf5 1.10.7 + +* Wed Jul 21 2021 Fedora Release Engineering - 10.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jul 15 2021 José Matos - 10.6.0-1 +- update to 10.6.0 +- BR flexiblas for Fedora and lapack, openblas and atlas for EPEL +- adapt armadillo-devel accordingly + +* Wed Jul 7 2021 José Matos - 10.5.3-1 +- update to 10.5.3 + +* Tue Jan 26 2021 Fedora Release Engineering - 10.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 20 2021 José Matos - 10.2.0-1 +- update to 10.2.0 + +* Tue Jan 5 2021 José Matos - 10.1.2-1 +- update to 10.1.2 + +* Fri Sep 4 2020 José Matos - 9.900.3-2 +- make extra_options empty in the correct way + +* Thu Sep 3 2020 José Matos - 9.900.3-1 +- update to 9.900.3 + +* Wed Aug 5 2020 José Matos - 9.900.2-5 +- add upstream patch to support flexiblas +- enable tests + +* Wed Aug 5 2020 José Matos - 9.900.2-4 +- clean the spec file and remove support for epel 6 + +* Sat Aug 01 2020 Fedora Release Engineering - 9.900.2-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 9.900.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +- Adapt cmake to work with out of tree builds (and other minor cleanups) + +* Fri Jul 17 2020 José Matos - 9.900.2-1 +- update to 9.900.2 + +* Fri Jul 3 2020 José Matos - 9.900.1-1 +- update to 9.900.1 + +* Thu Jun 25 2020 Orion Poplawski - 9.880.1-2 +- Rebuild for hdf5 1.10.6 + +* Sat May 16 2020 José Matos - 9.880.1-1 +- update to 9.880.1 + +* Wed Apr 1 2020 José Matos - 9.860.1-1 +- update to 9.860.1 + +* Sun Feb 23 2020 José Matos - 9.850.1-1 +- update to 9.850.1 +- update list of document files + +* Tue Jan 28 2020 Fedora Release Engineering - 9.800.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Dec 23 2019 José Matos - 9.800.3-1 +- update to 9.800.3 + * Tue Sep 3 2019 Devrim Gündüz - 9.700.2 - Update to 9.700.2 diff --git a/sources b/sources index 1201265..624edba 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (armadillo-9.600.6.tar.xz) = 0f079807be87035d5c72f59a675431156773b76d025cc7ea86cc31dd88392154ecf526d4ef9c249ff7049d455ea541b7428850f75bc63958d614e63f07588878 -SHA512 (armadillo-9.700.2.tar.xz) = f91d14269f79c2007303d98f865ec56eea78a5e5106cf2a9cd94f09b30cadffe06a209fd787f18d19b2acb2ad8d0d5c11739709c0c5033b23b09524428c4bdca +SHA512 (armadillo-10.8.2.tar.xz) = 720fadad491dfeeb894544b0305cd64a0e0402e66fc788949ecd54c0b1a3b9c3ede9f75b081f832931d59d2bd59529cebb9d5b57b8582df869765cac01c2979b