From bda785dac852566341488f01366161ad5d9ca26aeb496ed817511f12cb70deba Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Wed, 5 Oct 2016 14:33:49 +0000 Subject: [PATCH] Accepting request 433457 from home:dnh:branches:devel:libraries:c_c++ abiflags may differ (here "mu"), and some minor fixes (quickbook breaks unless the default) ... OBS-URL: https://build.opensuse.org/request/show/433457 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=176 --- boost.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/boost.spec b/boost.spec index a30763b..0893390 100644 --- a/boost.spec +++ b/boost.spec @@ -21,6 +21,7 @@ %define docs_version 1.56.0 %define short_version 1_56 %define lib_appendix 1_62_0 +# building manpages is broken %bcond_with build_docs %bcond_without package_pdf %bcond_without build_quickbook @@ -182,6 +183,7 @@ BuildArch: noarch This package contains the documentation of the boost dynamic libraries in HTML format. +%if %{with build_docs} # %%package doc-man # Summary: Man documentation for the Boost C++ Libraries # Group: Development/Libraries/C and C++ @@ -192,6 +194,7 @@ in HTML format. # %%description doc-man # This package contains the documentation of the boost dynamic libraries # as man pages. +%endif %if %{with package_pdf} %package -n %{package_name}-doc-pdf @@ -484,7 +487,7 @@ export LONG_DOUBLE_FLAGS="--disable-long-double" BJAM_CONFIG="-d2 -sICU_PATH=%{_prefix}" PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]') PYTHON3_VERSION=$(python3 -c 'import sys; print (sys.version[:3])') -PYTHON3_ABIFLAGS=m +PYTHON3_ABIFLAGS=$(python3 -c 'import sys; print (sys.abiflags);') export REGEX_FLAGS="--with-icu" export EXPAT_INCLUDE=%{_includedir} EXPAT_LIBPATH=%{_libdir} LIBRARIES_FLAGS=--with-libraries=all @@ -886,11 +889,13 @@ install -m 0755 dist/bin/quickbook %{buildroot}%{_bindir}/quickbook %doc %{my_docdir}/* %exclude %{my_docdir}/LICENSE_1_0.txt +%if %{with build_docs} # %%files doc-man # %%defattr(644, root, root, -) # %%doc %%{_mandir}/man3/*.3.gz # %%doc %%{_mandir}/man7/*.7.gz # %%doc %%{_mandir}/man9/*.9.gz +%endif %if %{with package_pdf} %files -n %{package_name}-doc-pdf @@ -898,8 +903,10 @@ install -m 0755 dist/bin/quickbook %{buildroot}%{_bindir}/quickbook %doc ../boost_%{short_version}_pdf/*.pdf %endif +%if %{with build_quickbook} %files -n %{package_name}-quickbook %defattr(-, root, root, -) %{_bindir}/quickbook +%endif %changelog