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
This commit is contained in:
Ismail Dönmez 2016-10-10 10:20:52 +00:00 committed by Git OBS Bridge
parent bda785dac8
commit 46d20c8fc1
2 changed files with 32 additions and 6 deletions

View File

@ -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 Thu Sep 29 10:56:49 UTC 2016 - adam.majer@suse.de

View File

@ -161,6 +161,17 @@ This package contains all that is needed to develop/compile
applications that use the Boost C++ libraries. For documentation see applications that use the Boost C++ libraries. For documentation see
the documentation packages (html, man or pdf). 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} %package -n boost-license%{lib_appendix}
Summary: Boost License Summary: Boost License
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
@ -591,6 +602,10 @@ cd doc
--libdir=%{buildroot}%{_libdir} --includedir=%{buildroot}%{_includedir} \ --libdir=%{buildroot}%{_libdir} --includedir=%{buildroot}%{_includedir} \
--user-config=./user-config.jam --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 # 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 # see https://bugzilla.redhat.com/show_bug.cgi?id=801534 for details
rm -f %{buildroot}%{_libdir}/mpi.so rm -f %{buildroot}%{_libdir}/mpi.so
@ -622,12 +637,7 @@ popd
# popd # popd
#install doc files #install doc files
dos2unix libs/ptr_container/doc/tutorial_example.html \ find libs/ -name \*.htm\* -o -name \*.css -o -name \*.js | xargs dos2unix
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 . -name \*.htm\* -o -name \*.gif -o -name \*.css -o -name \*.jpg -o -name \*.png -o -name \*.ico | \ 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 - tar --files-from=%{SOURCE4} -cf - --files-from=- | tar -C %{buildroot}%{my_docdir} -xf -
rm -rf %{buildroot}%{my_docdir}/boost 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_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 %post -n libboost_math%{lib_appendix} -p /sbin/ldconfig
%if %{with build_mpi} %if %{with build_mpi}
%post -n libboost_mpi%{lib_appendix} -p /sbin/ldconfig %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_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 %postun -n libboost_math%{lib_appendix} -p /sbin/ldconfig
%if %{with build_mpi} %if %{with build_mpi}
%postun -n libboost_mpi%{lib_appendix} -p /sbin/ldconfig %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 %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} %files -n boost-license%{lib_appendix}
%defattr(-, root, root, -) %defattr(-, root, root, -)
%dir %{my_docdir} %dir %{my_docdir}