From 46d20c8fc1221a35a95e4aecd02806ecbe26cb36d01ff43d2f100094278a61a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 10 Oct 2016 10:20:52 +0000 Subject: [PATCH] Accepting request 433729 from home:adamm:branches:devel:libraries:c_c++ - package boost-jam - add missing ldconfig for libboost_type_erasure - fix EOL encoding for documentation files OBS-URL: https://build.opensuse.org/request/show/433729 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=177 --- boost.changes | 7 +++++++ boost.spec | 31 +++++++++++++++++++++++++------ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/boost.changes b/boost.changes index 75a75b3..7e4d555 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 30 12:13:02 UTC 2016 - adam.majer@suse.de + +- package boost-jam +- add missing ldconfig for libboost_type_erasure +- fix EOL encoding for documentation files + ------------------------------------------------------------------- Thu Sep 29 10:56:49 UTC 2016 - adam.majer@suse.de diff --git a/boost.spec b/boost.spec index 0893390..ac1adb9 100644 --- a/boost.spec +++ b/boost.spec @@ -161,6 +161,17 @@ This package contains all that is needed to develop/compile applications that use the Boost C++ libraries. For documentation see the documentation packages (html, man or pdf). +%package -n %{package_name}-jam +Summary: A Boost Make Replacement +Group: Development/Tools/Building +Provides: boost-jam +Conflicts: otherproviders(boost-jam) + +%description -n %{package_name}-jam +Boost Jam is a build tool based on FTJam, which in turn is based on +Perforce Jam. It contains significant improvements made to facilitate +its use in the Boost Build System. + %package -n boost-license%{lib_appendix} Summary: Boost License Group: Development/Libraries/C and C++ @@ -591,6 +602,10 @@ cd doc --libdir=%{buildroot}%{_libdir} --includedir=%{buildroot}%{_includedir} \ --user-config=./user-config.jam +mkdir -p %{buildroot}%{_bindir} +install -m 755 bjam %{buildroot}%{_bindir} +ln -s bjam %{buildroot}%{_bindir}/jam + # do not install the python module - as long as noone needs it, it requires more fixes # see https://bugzilla.redhat.com/show_bug.cgi?id=801534 for details rm -f %{buildroot}%{_libdir}/mpi.so @@ -622,12 +637,7 @@ popd # popd #install doc files -dos2unix libs/ptr_container/doc/tutorial_example.html \ - libs/parameter/doc/html/reference.html \ - libs/parameter/doc/html/index.html \ - libs/iostreams/doc/tree/tree.js \ - libs/graph/doc/lengauer_tarjan_dominator.htm - +find libs/ -name \*.htm\* -o -name \*.css -o -name \*.js | xargs dos2unix find . -name \*.htm\* -o -name \*.gif -o -name \*.css -o -name \*.jpg -o -name \*.png -o -name \*.ico | \ tar --files-from=%{SOURCE4} -cf - --files-from=- | tar -C %{buildroot}%{my_docdir} -xf - rm -rf %{buildroot}%{my_docdir}/boost @@ -678,6 +688,8 @@ install -m 0755 dist/bin/quickbook %{buildroot}%{_bindir}/quickbook %post -n libboost_thread%{lib_appendix} -p /sbin/ldconfig +%post -n libboost_type_erasure%{lib_appendix} -p /sbin/ldconfig + %post -n libboost_math%{lib_appendix} -p /sbin/ldconfig %if %{with build_mpi} %post -n libboost_mpi%{lib_appendix} -p /sbin/ldconfig @@ -733,6 +745,8 @@ install -m 0755 dist/bin/quickbook %{buildroot}%{_bindir}/quickbook %postun -n libboost_thread%{lib_appendix} -p /sbin/ldconfig +%postun -n libboost_type_erasure%{lib_appendix} -p /sbin/ldconfig + %postun -n libboost_math%{lib_appendix} -p /sbin/ldconfig %if %{with build_mpi} %postun -n libboost_mpi%{lib_appendix} -p /sbin/ldconfig @@ -754,6 +768,11 @@ install -m 0755 dist/bin/quickbook %{buildroot}%{_bindir}/quickbook %postun -n libboost_graph_parallel%{lib_appendix} -p /sbin/ldconfig +%files -n %{package_name}-jam +%defattr(-, root, root, -) +%{_bindir}/bjam +%{_bindir}/jam + %files -n boost-license%{lib_appendix} %defattr(-, root, root, -) %dir %{my_docdir}