clean the spec file and remove support for epel 6

epel9
José Matos 4 years ago
parent 44379e52f6
commit 9fee79f6be

@ -1,27 +1,19 @@
Name: armadillo Name: armadillo
Version: 9.900.2 Version: 9.900.2
Release: 3%{?dist} Release: 4%{?dist}
Summary: Fast C++ matrix library with syntax similar to MATLAB and Octave Summary: Fast C++ matrix library with syntax similar to MATLAB and Octave
License: ASL 2.0 License: ASL 2.0
URL: http://arma.sourceforge.net/ URL: http://arma.sourceforge.net/
Source: http://sourceforge.net/projects/arma/files/%{name}-%{version}.tar.xz 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)) %if (0%{?rhel} || (0%{?fedora} && 0%{?fedora} < 33))
%undefine __cmake_in_source_build %undefine __cmake_in_source_build
%endif %endif
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: cmake, lapack-devel, arpack-devel BuildRequires: cmake, lapack-devel, arpack-devel
%if %{old_epel} == 0
BuildRequires: hdf5-devel BuildRequires: hdf5-devel
%endif
%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64} %{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
%ifarch %{openblas_arches} %ifarch %{openblas_arches}
BuildRequires: openblas-devel BuildRequires: openblas-devel
@ -49,9 +41,7 @@ than another language like Matlab or Octave.
Summary: Development headers and documentation for the Armadillo C++ library Summary: Development headers and documentation for the Armadillo C++ library
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: lapack-devel, arpack-devel, libstdc++-devel Requires: lapack-devel, arpack-devel, libstdc++-devel
%if %{old_epel} == 0
Requires: hdf5-devel Requires: hdf5-devel
%endif
%ifarch %{openblas_arches} %ifarch %{openblas_arches}
Requires: openblas-devel Requires: openblas-devel
%endif %endif
@ -66,35 +56,17 @@ and user documentation (API reference guide).
%prep %prep
%setup -q %setup -q
sed -i 's/\r//' README.md
# convert DOS end-of-line to UNIX end-of-line rm -rf examples/*win64* examples/Makefile.cmake
for file in README.md; do
sed 's/\r//' $file >$file.new && \
touch -r $file $file.new && \
mv $file.new $file
done
%build %build
%if %{old_epel} == 1 %cmake
%{cmake} -DDETECT_HDF5=OFF .
%else
%{cmake}
%endif
%cmake_build %cmake_build
%install %install
%if %{old_epel} == 1
rm -rf $RPM_BUILD_ROOT
%endif
%cmake_install %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) %if (0%{?rhel} && 0%{?rhel} <= 7)
@ -122,7 +94,10 @@ rm -rf examples/lib_win64
%changelog %changelog
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> * Wed Aug 5 2020 José Matos <jamatos@fedoraproject.org> - 9.900.2-4
- clean the spec file and remove support for epel 6
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.900.2-3
- Second attempt - Rebuilt for - Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Loading…
Cancel
Save