diff --git a/armadillo.spec b/armadillo.spec index bb4580f..d263c3f 100644 --- a/armadillo.spec +++ b/armadillo.spec @@ -1,27 +1,19 @@ Name: armadillo Version: 9.900.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Fast C++ matrix library with syntax similar to MATLAB and Octave License: ASL 2.0 URL: http://arma.sourceforge.net/ Source: http://sourceforge.net/projects/arma/files/%{name}-%{version}.tar.xz -%if 0%{?rhel} && 0%{?rhel} < 7 -%define old_epel 1 -%else -%define old_epel 0 -%endif - %if (0%{?rhel} || (0%{?fedora} && 0%{?fedora} < 33)) %undefine __cmake_in_source_build %endif BuildRequires: gcc-c++ BuildRequires: cmake, lapack-devel, arpack-devel -%if %{old_epel} == 0 -BuildRequires: hdf5-devel -%endif +BuildRequires: hdf5-devel %{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64} %ifarch %{openblas_arches} BuildRequires: openblas-devel @@ -49,9 +41,7 @@ than another language like Matlab or Octave. Summary: Development headers and documentation for the Armadillo C++ library Requires: %{name} = %{version}-%{release} Requires: lapack-devel, arpack-devel, libstdc++-devel -%if %{old_epel} == 0 Requires: hdf5-devel -%endif %ifarch %{openblas_arches} Requires: openblas-devel %endif @@ -66,35 +56,17 @@ 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 +sed -i 's/\r//' README.md +rm -rf examples/*win64* examples/Makefile.cmake %build -%if %{old_epel} == 1 -%{cmake} -DDETECT_HDF5=OFF . -%else -%{cmake} -%endif +%cmake %cmake_build %install -%if %{old_epel} == 1 -rm -rf $RPM_BUILD_ROOT -%endif %cmake_install -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 %if (0%{?rhel} && 0%{?rhel} <= 7) @@ -122,7 +94,10 @@ rm -rf examples/lib_win64 %changelog -* Sat Aug 01 2020 Fedora Release Engineering +* 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