Accepting request 721137 from home:StefanBruens:branches:science

Reduce dependency chain for main (devel) package

OBS-URL: https://build.opensuse.org/request/show/721137
OBS-URL: https://build.opensuse.org/package/show/science/eigen3?expand=0&rev=27

_multibuild

@@ -0,0 +1,3 @@
+<multibuild>
+  <package>docs</package>
+</multibuild>

eigen3.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug  5 23:28:16 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Convert to _multibuild, to avoid doc dependencies when building
+  the main package.
+
 -------------------------------------------------------------------
 Wed Jul 24 15:48:27 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 

eigen3.spec

@@ -15,17 +15,24 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-%bcond_with tests
-%bcond_without docs
 
-Name:           eigen3
+%global flavor @BUILD_FLAVOR@%{nil}
+%global pkgname eigen3
+
+%bcond_with tests
+
+%if "%{flavor}" == "docs"
+%define pkgsuffix -doc
+%endif
+
+Name:           eigen3%{?pkgsuffix}
 Version:        3.3.7
 Release:        0
 Summary:        C++ Template Library for Linear Algebra
 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
+Source0:        https://bitbucket.org/eigen/eigen/get/%{version}.tar.bz2#/%{pkgname}-%{version}.tar.bz2
 Patch0:         0001-Disable-Altivec-for-ppc64le.patch
 Patch1:         0001-Do-stack-allignment-on-ppc.patch
 # PATCH-FIX-OPENSUSE eigen_pkgconfig.patch asterios.dramis@gmail.com -- Fix pkg-config file includedir
@@ -48,7 +55,7 @@ BuildRequires:  pkg-config
 BuildRequires:  sparsehash-devel
 BuildRequires:  suitesparse-devel
 BuildRequires:  superlu-devel
-%if %{with docs}
+%if "%{flavor}" == "docs"
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  graphviz
@@ -79,13 +86,14 @@ Obsoletes:      libeigen3-devel < %{version}
 Eigen is a C++ template library for linear algebra: matrices, vectors,
 numerical solvers, and related algorithms.
 
-%package doc
+%if "%{flavor}" == "docs"
 Summary:        Documentation for the Eigen3 C++ Template Library for Linear Algebra
 Group:          Documentation/HTML
 
-%description doc
+%description
 Documentation in HTML format for the Eigen3 C++ Template Library
 for Linear Algebra
+%endif
 
 %prep
 %setup -q -n eigen-eigen-323c052e1731
@@ -107,8 +115,9 @@ echo "HTML_TIMESTAMP = NO" >> doc/Doxyfile.in
  -DINCLUDE_INSTALL_DIR=%{_includedir}/eigen3 \
  -DGOOGLEHASH_INCLUDES=%{_includedir}
 
+%if "%{flavor}" == ""
 make %{?_smp_mflags} all
-%if %{with docs}
+%else
 make %{?_smp_mflags} doc
 %endif
 
@@ -116,9 +125,17 @@ rm -f doc/html/*.tgz
 find doc -name _formulas.log -print -delete
 
 %install
+%if "%{flavor}" == ""
 %cmake_install
+%else
 %fdupes -s build/doc/html/
+%endif
 
+%if "%{flavor}" == "docs"
+%files
+%doc build/doc/html/
+
+%else
 %files devel
 %license COPYING.*
 %{_includedir}/eigen3/
@@ -126,7 +143,6 @@ find doc -name _formulas.log -print -delete
 %{_datadir}/pkgconfig/eigen3.pc
 %{_datadir}/cmake/Modules/FindEigen3.cmake
 
-%files doc
-%doc build/doc/html/
+%endif
 
 %changelog