From 677bdc7033dc219bf4c3421d52d4a6db87b5d2bcd22f1deed1b3eab9d260cd10 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 16 Sep 2010 07:41:49 +0000 Subject: [PATCH] removing 11.3 link OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=44 --- boost-autoconf-20100819.tar.bz2 | 3 + boost-autoconf.tar.bz2 | 3 - boost-fix_ICU_test.patch | 26 -------- boost-lib64.patch | 112 +++++++------------------------- boost-sane_versioning.patch | 8 +-- boost-strict_aliasing.patch | 24 ++++--- boost-thread.patch | 6 +- boost-use_std_xml_catalog.patch | 10 +-- boost.changes | 103 +++++++++++++++++++++++++++++ boost.spec | 94 +++++++++++++++++++-------- boost_1_42_0.tar.bz2 | 3 - boost_1_44_0.tar.bz2 | 3 + boost_1_44_man.tar.bz2 | 3 + boost_1_44_pdf.tar.bz2 | 3 + boost_man_1_42_0.tar.bz2 | 3 - boost_pdf_1_42_0.tar.bz2 | 3 - 16 files changed, 228 insertions(+), 179 deletions(-) create mode 100644 boost-autoconf-20100819.tar.bz2 delete mode 100644 boost-autoconf.tar.bz2 delete mode 100644 boost-fix_ICU_test.patch delete mode 100644 boost_1_42_0.tar.bz2 create mode 100644 boost_1_44_0.tar.bz2 create mode 100644 boost_1_44_man.tar.bz2 create mode 100644 boost_1_44_pdf.tar.bz2 delete mode 100644 boost_man_1_42_0.tar.bz2 delete mode 100644 boost_pdf_1_42_0.tar.bz2 diff --git a/boost-autoconf-20100819.tar.bz2 b/boost-autoconf-20100819.tar.bz2 new file mode 100644 index 0000000..29ef3e5 --- /dev/null +++ b/boost-autoconf-20100819.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:510c2e9cc86393599c1054b68b9e0debc8d6ad4abfcce2869b690d3987e3a741 +size 9452 diff --git a/boost-autoconf.tar.bz2 b/boost-autoconf.tar.bz2 deleted file mode 100644 index 7e2cc42..0000000 --- a/boost-autoconf.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51543a408c1f1af352127af41e346355e9ddce2fd5a3064bd764de86482ba20c -size 9879 diff --git a/boost-fix_ICU_test.patch b/boost-fix_ICU_test.patch deleted file mode 100644 index 857dceb..0000000 --- a/boost-fix_ICU_test.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: libs/regex/build/Jamfile.v2 -=================================================================== ---- libs/regex/build/Jamfile.v2.orig 2010-03-30 17:10:54.671004744 +0200 -+++ libs/regex/build/Jamfile.v2 2010-03-31 13:52:10.715279367 +0200 -@@ -51,6 +51,10 @@ rule check-icu-config ( ) - { - gICU_CORE_LIB = icuuc ; - } -+ else if [ GLOB $(dir)/lib64 : libicuuc.* ] -+ { -+ gICU_CORE_LIB = icuuc ; -+ } - else if [ GLOB $(dir)/lib : libicuuc.* ] - { - gICU_CORE_LIB = icuuc ; -@@ -119,6 +123,10 @@ rule check-icu-config ( ) - { - gICU_DATA_LIB = icudt ; - } -+ else if [ GLOB $(dir)/lib64 : libicudata.* ] -+ { -+ gICU_DATA_LIB = icudata ; -+ } - else if [ GLOB $(dir)/lib : libicudata.* ] - { - gICU_DATA_LIB = icudata ; diff --git a/boost-lib64.patch b/boost-lib64.patch index 7599216..ea430ed 100644 --- a/boost-lib64.patch +++ b/boost-lib64.patch @@ -1,91 +1,27 @@ ---- m4/ax_boost_base.m4 -+++ m4/ax_boost_base.m4 -@@ -35,6 +35,47 @@ - # permitted in any medium without royalty provided the copyright notice - # and this notice are preserved. +Index: m4/ax_boost_base.m4 +=================================================================== +--- m4/ax_boost_base.m4.orig 2010-08-19 00:00:00.000000000 +0200 ++++ m4/ax_boost_base.m4 2010-08-26 17:53:43.000000000 +0200 +@@ -84,15 +84,18 @@ if test "x$want_boost" = "xyes"; then + AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req) + succeeded=no -+AC_DEFUN([AX_BOOST_CHECK_LIB64], -+[ -+ AC_ARG_ENABLE(libsuffix, -+ AC_HELP_STRING([--enable-libsuffix], -+ [/lib directory suffix (64,32,none,auto[=default])]), -+ boostlibsuff=$enableval, boostlibsuff="auto") +- dnl On x86_64 systems check for system libraries in both lib64 and lib. ++ dnl On x86_64, ppc64 and s390x systems check for system libraries in both lib64 and lib. + dnl The former is specified by FHS, but e.g. Debian does not adhere to + dnl this (as it rises problems for generic multi-arch support). + dnl The last entry in the list is chosen by default when no libraries + dnl are found, e.g. when only header-only libraries are installed! + -+ -+ if test "$boostlibsuff" = "auto"; then -+ cat > conftest.c << EOF -+#include -+int main(int argc, char *argv[]) -+{ -+ return 0; -+} -+EOF -+ -+ boostlibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ -+ s,.*/lib\([[^\/]]*\)/.*,\1, -+ p -+}'` -+ rm -rf conftest.* -+ fi -+ -+ if test "$boostlibsuff" = "no" || test "$boostlibsuff" = "none"; then -+ boostlibsuff= -+ fi -+ if test -z "$boostlibsuff"; then -+ AC_MSG_RESULT([not using lib directory suffix]) -+ AC_DEFINE(BOOSTLIBSUFF, [""], Suffix for lib directories) -+ else -+ if test "$libdir" = '${exec_prefix}/lib'; then -+ libdir="$libdir${boostlibsuff}" -+ AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms -+ fi -+ AC_DEFINE_UNQUOTED(BOOSTLIBSUFF, ["${boostlibsuff}"], Suffix for lib directories) -+ AC_MSG_RESULT([using lib directory suffix $boostlibsuff]) -+ fi -+]) -+ -+ - AC_DEFUN([AX_BOOST_BASE], - [ - AC_ARG_WITH([boost], -@@ -77,6 +118,7 @@ - boost_lib_version_req_sub_minor="0" - fi - WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor` -+ AX_BOOST_CHECK_LIB64 - AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req) - succeeded=no + libsubdirs="lib" +- if test `uname -m` = x86_64; then +- libsubdirs="lib64 lib lib64" +- fi ++ case `uname -m` in ++ x86_64 | ppc64 | s390x) ++ libsubdirs="lib64 lib lib64" ++ ;; ++ esac -@@ -84,12 +126,12 @@ - dnl this location ist chosen if boost libraries are installed with the --layout=system option - dnl or if you install boost with RPM - if test "$ac_boost_path" != ""; then -- BOOST_LDFLAGS="-L$ac_boost_path/lib" -+ BOOST_LDFLAGS="-L$ac_boost_path/lib${boostlibsuff}" - BOOST_CPPFLAGS="-I$ac_boost_path/include" - else - for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do - if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then -- BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib" -+ BOOST_LDFLAGS="-L$ac_boost_path_tmp/lib${boostlibsuff}" - BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include" - break; - fi -@@ -99,7 +141,7 @@ - dnl overwrite ld flags if we have required special directory with - dnl --with-boost-libdir parameter - if test "$ac_boost_lib_path" != ""; then -- BOOST_LDFLAGS="-L$ac_boost_lib_path" -+ BOOST_LDFLAGS="-L$ac_boost_lib_path${boostlibsuff}" - fi - - CPPFLAGS_SAVED="$CPPFLAGS" -@@ -163,7 +205,7 @@ - BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE" - if test "$ac_boost_lib_path" = "" - then -- BOOST_LDFLAGS="-L$best_path/lib" -+ BOOST_LDFLAGS="-L$best_path/lib${boostlibsuff}" - fi - - if test "x$BOOST_ROOT" != "x"; then + dnl first we check the system location for boost libraries + dnl this location ist chosen if boost libraries are installed with the --layout=system option diff --git a/boost-sane_versioning.patch b/boost-sane_versioning.patch index d0898d7..e5ab4a3 100644 --- a/boost-sane_versioning.patch +++ b/boost-sane_versioning.patch @@ -1,8 +1,8 @@ Index: Jamroot =================================================================== ---- Jamroot.orig -+++ Jamroot -@@ -355,9 +355,7 @@ +--- Jamroot.orig 2010-08-24 14:03:40.000000000 +0200 ++++ Jamroot 2010-08-24 14:03:46.000000000 +0200 +@@ -377,9 +377,7 @@ rule tag ( name : type ? : property-set if $(layout) = versioned { result = [ common.format-name @@ -13,7 +13,7 @@ Index: Jamroot } else if $(layout) = tagged { -@@ -475,13 +473,9 @@ if $(layout-versioned) && ( [ modules.pe +@@ -527,13 +525,9 @@ if $(layout-versioned) && ( [ modules.pe return $(result) ; } diff --git a/boost-strict_aliasing.patch b/boost-strict_aliasing.patch index e59d796..ef98759 100644 --- a/boost-strict_aliasing.patch +++ b/boost-strict_aliasing.patch @@ -1,21 +1,19 @@ Index: libs/python/build/Jamfile.v2 =================================================================== ---- libs/python/build/Jamfile.v2.orig 2009-10-14 00:37:59.000000000 +0200 -+++ libs/python/build/Jamfile.v2 2010-03-26 16:49:22.348016732 +0100 -@@ -41,7 +41,8 @@ py3-version = [ find-py3-version ] ; +--- libs/python/build/Jamfile.v2.orig 2010-07-13 00:29:41.000000000 +0200 ++++ libs/python/build/Jamfile.v2 2010-08-24 12:51:20.939878260 +0200 +@@ -51,6 +51,7 @@ project boost/python + : requirements + -@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag + @$(__name__).tag ++ -fno-strict-aliasing + ; - project boost/python - : source-location ../src -- ; -+ : requirements -fno-strict-aliasing -+ ; - - rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } } - rule unless ( test ? : yes * : no * ) { if ! $(test) { return $(yes) ; } else { return $(no) ; } } + rule tag ( name : type ? : property-set ) Index: boost/function/function_base.hpp =================================================================== ---- boost/function/function_base.hpp.orig 2009-12-06 18:50:28.000000000 +0100 -+++ boost/function/function_base.hpp 2010-03-31 14:24:45.259010848 +0200 +--- boost/function/function_base.hpp.orig 2010-07-05 00:38:38.000000000 +0200 ++++ boost/function/function_base.hpp 2010-08-24 12:48:57.271702046 +0200 @@ -318,11 +318,11 @@ namespace boost { new ((void*)&out_buffer.data) functor_type(*in_functor); diff --git a/boost-thread.patch b/boost-thread.patch index 90bd578..558853c 100644 --- a/boost-thread.patch +++ b/boost-thread.patch @@ -1,8 +1,8 @@ Index: boost/config/compiler/gcc.hpp =================================================================== ---- boost/config/compiler/gcc.hpp.orig 2009-10-13 14:56:44.000000000 +0200 -+++ boost/config/compiler/gcc.hpp 2010-03-24 14:11:51.188512556 +0100 -@@ -79,7 +79,7 @@ +--- boost/config/compiler/gcc.hpp.orig 2010-07-01 13:59:21.000000000 +0200 ++++ boost/config/compiler/gcc.hpp 2010-08-24 14:01:18.000000000 +0200 +@@ -93,7 +93,7 @@ // those platforms where we can know for sure). It will get turned off again // later if no threading API is detected. // diff --git a/boost-use_std_xml_catalog.patch b/boost-use_std_xml_catalog.patch index f82c684..852a3c9 100644 --- a/boost-use_std_xml_catalog.patch +++ b/boost-use_std_xml_catalog.patch @@ -1,8 +1,8 @@ Index: tools/build/v2/tools/boostbook.jam =================================================================== ---- tools/build/v2/tools/boostbook.jam.orig 2009-07-15 20:44:38.000000000 +0200 -+++ tools/build/v2/tools/boostbook.jam 2010-04-07 17:34:23.603024152 +0200 -@@ -225,40 +225,7 @@ rule generate-xml-catalog ( target : sou +--- tools/build/v2/tools/boostbook.jam.orig 2010-07-12 09:37:43.000000000 +0200 ++++ tools/build/v2/tools/boostbook.jam 2010-08-24 14:02:42.000000000 +0200 +@@ -357,40 +357,7 @@ rule generate-xml-catalog ( target : sou " " : true ; @@ -19,7 +19,7 @@ Index: tools/build/v2/tools/boostbook.jam - } - else - { -- docbook-xsl-dir = [ regex.replace $(docbook-xsl-dir) " " "%20" ] ; +- docbook-xsl-dir = [ format-catalog-path $(docbook-xsl-dir) ] ; - print.text " " ; - } - @@ -36,7 +36,7 @@ Index: tools/build/v2/tools/boostbook.jam - } - else - { -- docbook-dtd-dir = [ regex.replace $(docbook-dtd-dir) " " "%20" ] ; +- docbook-dtd-dir = [ format-catalog-path $(docbook-dtd-dir) ] ; - print.text " " ; - } - diff --git a/boost.changes b/boost.changes index 1c9f7ca..833baef 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,106 @@ +------------------------------------------------------------------- +Fri Sep 3 17:38:42 CEST 2010 - pth@suse.de + +- Shorten the list of update items. +- Fix typo in spec. + +------------------------------------------------------------------- +Thu Aug 26 17:55:59 CEST 2010 - pth@suse.de + +- Redo the lib64 patch for the boost autoconf macros so that + lib64 is used on all archs that need it. +- Remove the ICU patch. + +------------------------------------------------------------------- +Thu Aug 26 10:55:59 CEST 2010 - pth@suse.de + +- Update to 1.44.0: + + New Libraries: + + * Meta State Machine: High-performance expressive UML2 finite + state machines + * Polygon: Booleans/clipping, resizing/offsetting and more for + planar polygons with integral coordinates + + Updated Libraries: + + * Accumulators: + * Asio: + * Foreach: + * Fusion: + * Hash: + * Math: + * MPL: + * Multi-index Containers: + * Proto: + * Regex: + * Thread: + * Type Traits: + * uBLAS: + * Utility: + * Uuid: + * Config: + * Xpressive: + + * Filesystem: + o This release contains both version 2 and version 3 of the + library. Version 3 is a major upgrade that will break some + existing user code, so version 2 is the default. Users are + encouraged to migrate to version 3. See 'Version 2' and + 'Version 3' for more information. + + * Iostreams: + + o Several fixes for file descriptors class, including a + breaking change to the constructors and open methods for + file_descriptor, file_descriptor_source and + file_descriptor_sink. See the documentation for details. + The old methods are still available if you define + BOOST_IOSTREAMS_USE_DEPRECATED + + * Spirit: Spirit V2.4, see the 'What's New' section for details. + + * System: + o Change system_category and generic_category to functions, to + conform to the C++0x FCD. This change may cause compile + errors some user code; the fix is add "()" to references to + system_category and generic_category, so that they become + function calls. + + * Wave: See the Changelog for details. + + Major Changes in 1.43.0: + + New Libraries + * Functional/factory: Function objects for dynamic and by-value + construction + * Functional/forward: Function object adapters to address the + forwarding problem + + For a complete list of changes see + http://www.boost.org/users/news/version_1_43_0 and + http://www.boost.org/users/news/version_1_44_0. + + +------------------------------------------------------------------- +Fri Jul 9 13:17:57 CEST 2010 - pth@suse.de + +- Rename patch to be identical to the one checked in for 11.3. + The patch adds an explicite specialization to the call to prevent + unwanted temporary instantiations. + + +------------------------------------------------------------------- +Fri Jul 9 09:34:03 UTC 2010 - lnussel@suse.de + +- fix bug that shows with gcc 4.5 (bnc#621140) + +------------------------------------------------------------------- +Wed Jun 16 14:46:52 CEST 2010 - pth@suse.de + +- Noarch sub packages only doable from 11.2 on up. + ------------------------------------------------------------------- Thu Jun 10 09:02:34 UTC 2010 - wittemar@googlemail.com diff --git a/boost.spec b/boost.spec index 1f34419..4df4379 100644 --- a/boost.spec +++ b/boost.spec @@ -1,5 +1,5 @@ # -# spec file for package boost (Version 1.42.0) +# spec file for package boost (Version 1.44.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,10 +17,13 @@ # norootforbuild -%define ver 1.42.0 -%define file_version 1_42_0 -%define short_version 1_42 -%define lib_appendix 1_42_0 +%define ver 1.44.0 +%define file_version 1_44_0 +%define short_version 1_44 +%define lib_appendix 1_44_0 + +#Version of autoconf archive the boost macros where taken from. +%define archive_version 20100819 #Only define to 1 to generate the man pages %define build_docs 0 @@ -40,7 +43,13 @@ %define disable_long_double 0 %endif -%define most_libs libboost_date_time%{lib_appendix} libboost_filesystem%{lib_appendix} libboost_graph%{lib_appendix} libboost_iostreams%{lib_appendix} libboost_math%{lib_appendix} libboost_test%{lib_appendix} libboost_program_options%{lib_appendix} libboost_python%{lib_appendix} libboost_serialization%{lib_appendix} libboost_signals%{lib_appendix} libboost_system%{lib_appendix} libboost_thread%{lib_appendix} libboost_wave%{lib_appendix} libboost_regex%{lib_appendix} +%define boost_libs1 libboost_date_time%{lib_appendix} libboost_filesystem%{lib_appendix} libboost_graph%{lib_appendix} +%define boost_libs2 libboost_iostreams%{lib_appendix} libboost_math%{lib_appendix} libboost_test%{lib_appendix} +%define boost_libs3 libboost_program_options%{lib_appendix} libboost_python%{lib_appendix} libboost_serialization%{lib_appendix} +%define boost_libs4 libboost_signals%{lib_appendix} libboost_system%{lib_appendix} libboost_thread%{lib_appendix} +%define boost_libs5 libboost_wave%{lib_appendix} libboost_regex%{lib_appendix} libboost_regex%{lib_appendix} + +%define most_libs %boost_libs1 %boost_libs2 %boost_libs3 %boost_libs4 %boost_libs5 %if %build_mpi %define all_libs %{most_libs} libboost_mpi%{lib_appendix} @@ -52,12 +61,12 @@ Name: boost BuildRequires: boost-jam >= 3.1.18 dos2unix gcc-c++ libbz2-devel libicu-devel python-devel xorg-x11-devel -BuildRequires: libexpat-devel +BuildRequires: chrpath libexpat-devel %if %build_mpi BuildRequires: openmpi-devel %endif %if %build_docs -BuildRequires: docbook docbook-xsl-stylesheets doxygen python-devel texlive-latex +BuildRequires: docbook docbook-xsl-stylesheets doxygen libxslt python-devel texlive-latex %endif %if 0%suse_version > 1020 BuildRequires: fdupes @@ -68,13 +77,13 @@ Group: Development/Libraries/C and C++ Summary: Boost C++ Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: %{ver} -Release: 5 +Release: 1 Source0: %{name}_%{file_version}.tar.bz2 Source1: boost-rpmlintrc -Source2: %{name}_man_%{file_version}.tar.bz2 -Source3: %{name}_pdf_%{file_version}.tar.bz2 +Source2: %{name}_%{short_version}_man.tar.bz2 +Source3: %{name}_%{short_version}_pdf.tar.bz2 Source4: existing_extra_docs -Source5: boost-autoconf.tar.bz2 +Source5: boost-autoconf-%{archive_version}.tar.bz2 Patch1: boost-thread.patch Patch2: boost-no_type_punning.patch Patch4: boost-visit_each.diff @@ -82,7 +91,6 @@ Patch8: boost-no_segfault_in_Regex_filter.patch Patch19: boost-sane_versioning.patch Patch20: boost-strict_aliasing.patch Patch21: boost-lib64.patch -Patch22: boost-fix_ICU_test.patch Patch50: boost-use_std_xml_catalog.patch Patch51: boost-fix_documentation.patch Recommends: %{all_libs} @@ -132,7 +140,9 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Provides: boost-license = %{version}-%{release} Obsoletes: boost-license < %{version} +%if 0%{?suse_version} >= 1120 BuildArch: noarch +%endif %description -n boost-license%{lib_appendix} This package contains the license boost is provided under. @@ -141,10 +151,12 @@ This package contains the license boost is provided under. %package doc-html License: BSD3c -Summary: Documentation for the Boost C++ Libraries +Summary: HTML documentation for the Boost C++ Libraries Group: Development/Libraries/C and C++ AutoReqProv: on +%if 0%{?suse_version} >= 1120 BuildArch: noarch +%endif %description doc-html This package contains the documentation of the boost dynamic libraries @@ -154,10 +166,12 @@ in HTML format. %package doc-man License: BSD3c -Summary: Documentation for the Boost C++ Libraries +Summary: Man documentation for the Boost C++ Libraries Group: Development/Libraries/C and C++ AutoReqProv: on +%if 0%{?suse_version} >= 1120 BuildArch: noarch +%endif %description doc-man This package contains the documentation of the boost dynamic libraries @@ -167,10 +181,12 @@ as man pages. %package doc-pdf License: BSD3c -Summary: Documentation for the Boost C++ Libraries +Summary: PDF documentation for the Boost C++ Libraries Group: Development/Libraries/C and C++ AutoReqProv: on +%if 0%{?suse_version} >= 1120 BuildArch: noarch +%endif %description doc-pdf This package contains the documentation of the boost dynamic libraries @@ -387,16 +403,26 @@ AutoReqProv: on %description -n libboost_regex%{lib_appendix} This package contains the Boost::Regex runtime library. +%package -n libboost_random%{lib_appendix} + + +License: BSD3c +Summary: The Boost::Random runtime library +Group: System/Libraries +Requires: boost-license%{lib_appendix} +AutoReqProv: on + +%description -n libboost_random%{lib_appendix} +This package contains the Boost:Random runtime library. + %prep %if %build_docs -%setup -q -n %{name}_%{file_version} -a 5 +%setup -q -n %{name}_%{file_version} -a 5 -b 3 %else -%setup -q -n %{name}_%{file_version} -a 2 -a 5 +%setup -q -n %{name}_%{file_version} -a 2 -a 5 -b 3 %endif -tar -C doc/pdf -xvf %{S:3} -find -name .cvsignore -exec rm -f {} + #everything in the tarball has the executable flag set ...... find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} + %patch1 @@ -406,7 +432,6 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} %patch19 %patch20 %patch21 -%patch22 %patch50 %patch51 @@ -418,7 +443,8 @@ find . -type f -exec chmod u+w {} + # Now build it J_P=%{jobs} -J_G=$(getconf _NPROCESSORS_CONF) +J_G=$(getconf _NPROCESSORS_ONLN) +[ $J_G -gt 64 ] && J_G=64 if test -z "$JOBS"; then JOBS=$J_G @@ -483,7 +509,8 @@ cd doc %install # Now build it J_P=%{jobs} -J_G=$(getconf _NPROCESSORS_CONF) +J_G=$(getconf _NPROCESSORS_ONLN) +[ $J_G -gt 64 ] && J_G=64 if test -z "$JOBS"; then JOBS=$J_G @@ -521,7 +548,10 @@ source /var/mpi-selector/data/$(rpm --qf "%{NAME}-%{VERSION}" -q openmpi).sh mkdir -p %{buildroot}%{_docdir} pushd %{buildroot}%{_libdir} -for lib in $(find . -name \*.so.%{version}); do +blibs=$(find . -name \*.so.%{version}) +echo $blibs | xargs chrpath -d + +for lib in ${blibs}; do BASE=$(basename ${lib} .so.%{version}) SONAME_MT="$BASE-mt.so" ln -sf ${lib} $SONAME_MT @@ -541,7 +571,7 @@ popd #install the pdf documentation install -d %buildroot/%{_docdir}/pdf -install -p -m 644 doc/pdf/*.pdf %{buildroot}/%{_docdir}/pdf/ +install -p -m 644 ../%{name}_%{short_version}_pdf/*.pdf %{buildroot}/%{_docdir}/pdf/ #install autoconf macros install -d %{buildroot}%{_datadir}/aclocal @@ -594,11 +624,13 @@ rm -f %{buildroot}%{_libdir}/*.a %post -n libboost_mpi%{lib_appendix} -p /sbin/ldconfig %endif -%post -n libboost_graph%{lib_appendix} -p /sbin/ldconfig +%post -n libboost_graph%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_system%{lib_appendix} -p /sbin/ldconfig +%post -n libboost_system%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_wave%{lib_appendix} -p /sbin/ldconfig +%post -n libboost_wave%{lib_appendix} -p /sbin/ldconfig + +%post -n libboost_random%{lib_appendix} -p /sbin/ldconfig %postun -n libboost_date_time%{lib_appendix} -p /sbin/ldconfig @@ -632,6 +664,8 @@ rm -f %{buildroot}%{_libdir}/*.a %postun -n libboost_wave%{lib_appendix} -p /sbin/ldconfig +%postun -n libboost_random%{lib_appendix} -p /sbin/ldconfig + %files -n boost-license%{lib_appendix} %defattr(-, root, root, -) %dir %{_docdir} @@ -702,6 +736,10 @@ rm -f %{buildroot}%{_libdir}/*.a %defattr(-, root, root, -) %{_libdir}/libboost_regex*.so.* +%files -n libboost_random%{lib_appendix} +%defattr(-, root, root, -) +%{_libdir}/libboost_random*.so.* + %files devel %defattr(-, root, root, -) %{_includedir}/boost diff --git a/boost_1_42_0.tar.bz2 b/boost_1_42_0.tar.bz2 deleted file mode 100644 index 9945013..0000000 --- a/boost_1_42_0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b1eb95bd250ce15ac66435d6167f225b072b0d3a7eb72477a31847a9ca9e609 -size 33426755 diff --git a/boost_1_44_0.tar.bz2 b/boost_1_44_0.tar.bz2 new file mode 100644 index 0000000..de78aeb --- /dev/null +++ b/boost_1_44_0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45c328029d97d1f1dc7ff8c9527cd0c5cc356636084a800bca2ee4bfab1978db +size 38806420 diff --git a/boost_1_44_man.tar.bz2 b/boost_1_44_man.tar.bz2 new file mode 100644 index 0000000..8bb80fa --- /dev/null +++ b/boost_1_44_man.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3cde99675e295ba6f3a164a4646f236e2922a0e879800037b4f4fb5344e45a12 +size 462148 diff --git a/boost_1_44_pdf.tar.bz2 b/boost_1_44_pdf.tar.bz2 new file mode 100644 index 0000000..f0b9b8c --- /dev/null +++ b/boost_1_44_pdf.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d32223c7b792dd8f639f3011dcf8c7e6a373a2b1475f7503c70ee3ec761f3b0e +size 29820689 diff --git a/boost_man_1_42_0.tar.bz2 b/boost_man_1_42_0.tar.bz2 deleted file mode 100644 index dac5a6f..0000000 --- a/boost_man_1_42_0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3774cbbcb00d128a852ac21a063e1c75c6ad15723a25b7a1d89fd66c7591bba8 -size 454394 diff --git a/boost_pdf_1_42_0.tar.bz2 b/boost_pdf_1_42_0.tar.bz2 deleted file mode 100644 index 88738bd..0000000 --- a/boost_pdf_1_42_0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f09dd8a70e0da917104c86a7ef2a95c23669ff983bffbd5cc43981c7461e0f76 -size 24365143