From 6ce7a88e7cd69510fdb94704ff95f01104ff23e2e8f2a7765a933c3458e7d587 Mon Sep 17 00:00:00 2001 From: Asterios Dramis Date: Thu, 25 Jul 2019 16:59:53 +0000 Subject: [PATCH] Accepting request 718313 from home:StefanBruens:branches:science - Clean up spec file: * Correct License tag, some included algorithms are LGPL-2.1-only * Remove conditionals for obsolete distributions (which were failing or unresolvable anyway) * Remove defattr, use license macro * Hide GL/GLUT/GLEW BuildRequires behind tests bcond, as tests are not build currently * Add missing BuildRequires tex(newunicodechar.sty), group doc dependencies OBS-URL: https://build.opensuse.org/request/show/718313 OBS-URL: https://build.opensuse.org/package/show/science/eigen3?expand=0&rev=22 --- eigen3.changes | 12 ++++++++++++ eigen3.spec | 51 +++++++++++++++++++++++++------------------------- 2 files changed, 38 insertions(+), 25 deletions(-) diff --git a/eigen3.changes b/eigen3.changes index c330479..0f35f58 100644 --- a/eigen3.changes +++ b/eigen3.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Jul 24 15:48:27 UTC 2019 - Stefan BrĂ¼ns + +- Clean up spec file: + * Correct License tag, some included algorithms are LGPL-2.1-only + * Remove conditionals for obsolete distributions (which were failing + or unresolvable anyway) + * Remove defattr, use license macro + * Hide GL/GLUT/GLEW BuildRequires behind tests bcond, as tests are + not build currently + * Add missing BuildRequires tex(newunicodechar.sty), group doc dependencies + ------------------------------------------------------------------- Tue Feb 26 19:32:49 UTC 2019 - Bernhard Wiedemann diff --git a/eigen3.spec b/eigen3.spec index 0541ec5..90df1d1 100644 --- a/eigen3.spec +++ b/eigen3.spec @@ -1,7 +1,7 @@ # # spec file for package eigen3 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,15 +12,17 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%bcond_with tests +%bcond_without docs Name: eigen3 Version: 3.3.7 Release: 0 Summary: C++ Template Library for Linear Algebra -License: MPL-2.0 and LGPL-2.1+ and BSD-3-Clause +License: MPL-2.0 AND LGPL-2.1-only AND LGPL-2.1-or-later AND BSD-3-Clause Group: Development/Libraries/C and C++ Url: http://eigen.tuxfamily.org/ Source0: https://bitbucket.org/eigen/eigen/get/%{version}.tar.bz2#/%{name}-%{version}.tar.bz2 @@ -34,37 +36,33 @@ Patch3: 01_install_FindEigen3.patch Patch4: eigen3-3.3.1-fixcmake.patch BuildRequires: adolc-devel BuildRequires: cmake -BuildRequires: doxygen -BuildRequires: fdupes BuildRequires: fftw3-devel -BuildRequires: freeglut-devel BuildRequires: gcc-c++ BuildRequires: gcc-fortran -BuildRequires: glew-devel BuildRequires: gmp-devel -BuildRequires: graphviz -BuildRequires: graphviz-gd BuildRequires: gsl-devel -%if 0%{?suse_version} > 1320 BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif -%if 0%{?suse_version} == 1315 -BuildRequires: libqt4-devel -%endif +BuildRequires: metis-devel BuildRequires: mpfr-devel BuildRequires: pkg-config BuildRequires: sparsehash-devel BuildRequires: suitesparse-devel BuildRequires: superlu-devel +%if %{with docs} +BuildRequires: doxygen +BuildRequires: fdupes +BuildRequires: graphviz +BuildRequires: graphviz-gd BuildRequires: texlive-dvips BuildRequires: texlive-latex -BuildRequires: pkgconfig(gl) -BuildArch: noarch -%if 0%{?suse_version} > 1310 -BuildRequires: metis-devel +BuildRequires: tex(newunicodechar.sty) %endif +%if %{with tests} +BuildRequires: freeglut-devel +BuildRequires: glew-devel +BuildRequires: pkgconfig(gl) +%endif +BuildArch: noarch %description Eigen is a C++ template library for linear algebra: matrices, vectors, @@ -108,23 +106,26 @@ echo "HTML_TIMESTAMP = NO" >> doc/Doxyfile.in -DCMAKE_BUILD_TYPE=Release \ -DINCLUDE_INSTALL_DIR=%{_includedir}/eigen3 \ -DGOOGLEHASH_INCLUDES=%{_includedir} -make %{?_smp_mflags} all doc -rm -f doc/html/*.tgz `find doc -name _formulas.log` +make %{?_smp_mflags} all +%if %{with docs} +make %{?_smp_mflags} doc +%endif + +rm -f doc/html/*.tgz +find doc -name _formulas.log -print -delete %install %cmake_install %fdupes -s build/doc/html/ %files devel -%defattr(-,root,root,-) -%doc COPYING.* +%license COPYING.* %{_includedir}/eigen3/ %{_datadir}/eigen3/ %{_datadir}/pkgconfig/eigen3.pc %{_datadir}/cmake/Modules/FindEigen3.cmake %files doc -%defattr(-,root,root,-) %doc build/doc/html/ %changelog