From 8d601598fadacf2b4f1defac4100eb8e311cf9d5 Mon Sep 17 00:00:00 2001 From: Jiri Kucera Date: Thu, 1 Jul 2021 00:27:38 +0200 Subject: [PATCH] Fix License, drop unnecessary dependencies Fix License tag by adding missing license. Drop unnecessary dependencies. Resolves: #1967481 --- eigen3.spec | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/eigen3.spec b/eigen3.spec index 7e04142..9a8f0a3 100644 --- a/eigen3.spec +++ b/eigen3.spec @@ -22,12 +22,18 @@ %bcond_without qt %endif +%bcond_with sparsehash +%bcond_with suitesparse +%bcond_with SuperLU +%bcond_with scotch +%bcond_with metis + Name: eigen3 Version: 3.3.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A lightweight C++ template library for vector and matrix math -License: MPLv2.0 and LGPLv2+ and BSD +License: MPLv2.0 and LGPLv2+ and BSD and Minpack URL: http://eigen.tuxfamily.org/index.php?title=Main_Page Source0: https://gitlab.com/libeigen/eigen/-/archive/%{version}/eigen-%{version}.tar.bz2 @@ -41,15 +47,15 @@ BuildRequires: glew-devel BuildRequires: gmp-devel BuildRequires: gsl-devel BuildRequires: mpfr-devel -BuildRequires: sparsehash-devel -BuildRequires: suitesparse-devel +%{?with_sparsehash:BuildRequires: sparsehash-devel} +%{?with_suitesparse:BuildRequires: suitesparse-devel} BuildRequires: gcc-gfortran -BuildRequires: SuperLU-devel +%{?with_SuperLU:BuildRequires: SuperLU-devel} %if %{with qt} BuildRequires: qt-devel %endif -BuildRequires: scotch-devel -BuildRequires: metis-devel +%{?with_scotch:BuildRequires: scotch-devel} +%{?with_metis:BuildRequires: metis-devel} BuildRequires: cmake BuildRequires: make @@ -90,9 +96,9 @@ Developer documentation for Eigen. %cmake \ -DINCLUDE_INSTALL_DIR=include/%{name} \ -DBLAS_LIBRARIES="-l%{blaslib}" \ - -DSUPERLU_INCLUDES=%{_includedir}/SuperLU \ - -DSCOTCH_INCLUDES=%{_includedir} -DSCOTCH_LIBRARIES="scotch" \ - -DMETIS_INCLUDES=%{_includedir} -DMETIS_LIBRARIES="metis" \ + %{?with_SuperLU:-DSUPERLU_INCLUDES=%{_includedir}/SuperLU} \ + %{?with_scotch:-DSCOTCH_INCLUDES=%{_includedir} -DSCOTCH_LIBRARIES="scotch"} \ + %{?with_metis:-DMETIS_INCLUDES=%{_includedir} -DMETIS_LIBRARIES="metis"} \ -DCMAKEPACKAGE_INSTALL_DIR=share/cmake/%{name} %cmake_build @@ -114,7 +120,7 @@ rm -f %{_vpath_builddir}/doc/html/unsupported/installdox %files devel -%license COPYING.README COPYING.BSD COPYING.MPL2 COPYING.LGPL +%license COPYING.README COPYING.BSD COPYING.MPL2 COPYING.LGPL COPYING.MINPACK %{_includedir}/%{name} %{_datadir}/cmake/%{name} %{_datadir}/pkgconfig/%{name}.pc @@ -124,6 +130,11 @@ rm -f %{_vpath_builddir}/doc/html/unsupported/installdox %changelog +* Wed Jun 30 2021 Jiri Kucera - 3.3.9-6 +- Added missing Minpack license + Dropped unnecessary dependencies + Resolves: #1967481 + * Thu Apr 15 2021 Mohan Boddu - 3.3.9-5 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937