diff --git a/NEWS b/NEWS deleted file mode 100644 index 7880095..0000000 --- a/NEWS +++ /dev/null @@ -1,107 +0,0 @@ -Version 1.46.1 - -March 12th, 2011 15:45 GMT - -Updated Libraries - - • Asio: - - EV_ONESHOT seems to cause problems on some versions of Mac OS X, with - the io_service destructor getting stuck inside the close() system call. - Changed the kqueue backend to use EV_CLEAR instead (#5021). - - Fixed compile failures with some versions of g++ due to the use of - anonymous enums (#4883). - - Fixed a bug on kqueue-based platforms, where some system calls that - repeatedly fail with EWOULDBLOCK are not correctly re-registered with - kqueue. - - Changed asio::streambuf to ensure that its internal pointers are - updated correctly after the data has been modified using std::streambuf - member functions. - - Fixed a bug that prevented the linger socket option from working on - platforms other than Windows. - • Fusion: - - Fix disable_if for Visual C++ 7.1/8.0 - • Filesystem: - - Fix for STLPort (#5217). - - PGI large file support - • Graph: - - Bug fixes, including fixes for: #5181, #5180, #5199 and #5175. - • Icl: - - Intersects for interval_maps and segment_type/element_type (#5207). - - Fixed some ambiguous calls to functions in boost and std namespaces. - - Other bug fixes, and documentation fixes. - • Math: - - Several minor bug fixes. - • Polygon: - - Disabled 45-degree booleans optimization. - • Proto: - - Make display_expr copyable (#5096). - - Fix const correctness problem in pass_through. - • Property Tree: - - Fix compile error in JSON parser. - • Signals2: - - Fix unused parameter warning. - • TR1: - - Allow specialization of std::tr1::hash. - - Improved support for Pathscale and Sun compilers. - • Unordered: - - Add missing copy constructors and assignment operators when using - rvalue references (#5119). - -Other changes - - • Update getting started guide to reflect changes to boost build. - • In quickbook, workaround optimization bug in g++ 4.4. - -Compilers Tested - -Boost's primary test compilers are: - - • Linux: - - GCC: 3.4.6, 4.2.4, 4.3.4, 4.4.1, 4.4.3, 4.4.5, 4.5.2 - - GCC, C++0x mode: 4.3.4, 4.4.3, 4.5.2 - - Intel: 10.1, 11.0, 11.1 - - Clang: 2.8 - - Pathscale: 3.2 - • OS X: - - GCC: 4.0.1, 4.2.1, 4.4 - - GCC, C++0x mode: 4.4. - - Intel: 11.1 - • Windows: - - Visual C++: 7.1, 8.0, 9.0 and 10.0. - - GCC, mingw: 4.4.0. - • FreeBSD: - - GCC: 4.2.1, 64 bit. - -Boost's additional test compilers include: - - • Linux: - - GCC: 3.4.6, 4.2.4, 4.3.4, 4.4.3, 4.4.4, 4.4.5, 4.5.2 - - GCC, C++0x mode: 4.3.4, 4.4.3, 4.5.2 - - pgCC: 11.2 - - Intel: 10.1, 11.0, 11.1 - - PathScale: 3.2, 4.0.8 - - Visual Age C++: 10.1 - - Clang from subversion - • OS X: - - Intel C++ Compiler: 10.1, 11.0, 11.1 - - GCC: 4.0.1, 4.2.1, 4.4.4 - - GCC, C++0x mode: 4.4.4 - - Clang from subversion, with GNU libstdc++, libc++ and libc++ in C++0x - mode. - • Windows: - - Visual C++: 7.1, 9.0, 10.0 - - Visual C++ with STLport: 9.0 - - Visual C++, Windows Mobile 5, with STLport: 9.0 - - GCC, mingw: 4.5.1 - - GCC, mingw, C++0x mode: 4.5.1 - - Borland: 6.1.3 (2009), 6.2.1 (2010) - • AIX: - - IBM XL C/C++ Enterprise Edition, V11.1.0.0 - • Solaris: - - Sun C++: 5.10 - -Acknowledgements - -Beman Dawes, Eric Niebler, Rene Rivera, Daniel James and Vladimir Prus managed -this release. - diff --git a/boost-chrono_add_function_return.patch b/boost-chrono_add_function_return.patch new file mode 100644 index 0000000..be08043 --- /dev/null +++ b/boost-chrono_add_function_return.patch @@ -0,0 +1,12 @@ +Index: boost/chrono/detail/inlined/posix/process_cpu_clocks.hpp +=================================================================== +--- boost/chrono/detail/inlined/posix/process_cpu_clocks.hpp.orig 2011-11-26 01:49:13.000000000 +0100 ++++ boost/chrono/detail/inlined/posix/process_cpu_clocks.hpp 2012-03-13 19:34:38.197168044 +0100 +@@ -213,6 +213,7 @@ process_system_cpu_clock::time_point pro + else + { + BOOST_ASSERT(0 && "Boost::Chrono - Internal Error"); ++ return time_point(); + } + } + } diff --git a/boost-fix-spirit-attr-handling.patch b/boost-fix-spirit-attr-handling.patch deleted file mode 100644 index 2a969ff..0000000 --- a/boost-fix-spirit-attr-handling.patch +++ /dev/null @@ -1,47 +0,0 @@ -Index: boost/spirit/home/qi/auxiliary/attr.hpp -=================================================================== ---- boost/spirit/home/qi/auxiliary/attr.hpp (revision 69217) -+++ boost/spirit/home/qi/auxiliary/attr.hpp (revision 69218) -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -96,6 +97,14 @@ - }; - }}} - -+namespace boost { namespace spirit { namespace traits -+{ -+ /////////////////////////////////////////////////////////////////////////// -+ template -+ struct handles_container, Attr, Context, Iterator> -+ : traits::is_container {}; -+}}} -+ - #endif - - -Index: boost/spirit/home/qi/string/symbols.hpp -=================================================================== ---- boost/spirit/home/qi/string/symbols.hpp (revision 70041) -+++ boost/spirit/home/qi/string/symbols.hpp (revision 70042) -@@ -398,6 +398,15 @@ - }; - }}} - -+namespace boost { namespace spirit { namespace traits -+{ -+ /////////////////////////////////////////////////////////////////////////// -+ template -+ struct handles_container, Attr, Context, Iterator> -+ : traits::is_container {}; -+}}} -+ - #if defined(BOOST_MSVC) - # pragma warning(pop) - #endif diff --git a/boost-fix_documentation.patch b/boost-fix_documentation.patch index fb11265..a9e592f 100644 --- a/boost-fix_documentation.patch +++ b/boost-fix_documentation.patch @@ -1,7 +1,7 @@ Index: boost/accumulators/framework/accumulator_set.hpp =================================================================== ---- boost/accumulators/framework/accumulator_set.hpp.orig 2009-07-22 19:02:50.000000000 +0200 -+++ boost/accumulators/framework/accumulator_set.hpp 2011-02-24 14:26:29.213705826 +0100 +--- boost/accumulators/framework/accumulator_set.hpp.orig 2012-03-13 17:20:43.831945305 +0100 ++++ boost/accumulators/framework/accumulator_set.hpp 2012-03-13 17:22:18.819680809 +0100 @@ -234,7 +234,6 @@ struct accumulator_set /////////////////////////////////////////////////////////////////////////////// @@ -20,8 +20,8 @@ Index: boost/accumulators/framework/accumulator_set.hpp { Index: boost/accumulators/framework/extractor.hpp =================================================================== ---- boost/accumulators/framework/extractor.hpp.orig 2008-06-20 05:47:42.000000000 +0200 -+++ boost/accumulators/framework/extractor.hpp 2011-02-24 14:26:29.214705762 +0100 +--- boost/accumulators/framework/extractor.hpp.orig 2012-03-13 17:20:43.831945305 +0100 ++++ boost/accumulators/framework/extractor.hpp 2012-03-13 17:22:18.819680809 +0100 @@ -94,7 +94,6 @@ struct extractor }; @@ -40,8 +40,8 @@ Index: boost/accumulators/framework/extractor.hpp typename detail::extractor_result::type Index: boost/algorithm/string/finder.hpp =================================================================== ---- boost/algorithm/string/finder.hpp.orig 2009-09-13 21:10:55.000000000 +0200 -+++ boost/algorithm/string/finder.hpp 2011-02-24 14:26:29.260702841 +0100 +--- boost/algorithm/string/finder.hpp.orig 2012-03-13 17:20:43.831945305 +0100 ++++ boost/algorithm/string/finder.hpp 2012-03-13 17:22:18.819680809 +0100 @@ -43,7 +43,6 @@ namespace boost { The result is given as an \c iterator_range delimiting the match. @@ -108,10 +108,10 @@ Index: boost/algorithm/string/finder.hpp inline detail::range_finderF Index: boost/algorithm/string/formatter.hpp =================================================================== ---- boost/algorithm/string/formatter.hpp.orig 2009-09-13 21:10:55.000000000 +0200 -+++ boost/algorithm/string/formatter.hpp 2011-02-24 14:26:29.293700743 +0100 +--- boost/algorithm/string/formatter.hpp.orig 2012-03-13 17:20:43.831945305 +0100 ++++ boost/algorithm/string/formatter.hpp 2012-03-13 17:22:18.819680809 +0100 @@ -76,8 +76,6 @@ namespace boost { - Construct the \c empty_formatter. Empty formatter always returns an empty + Constructs an \c empty_formatter. Empty formatter always returns an empty sequence. - \param Input container used to select a correct value_type for the @@ -121,8 +121,8 @@ Index: boost/algorithm/string/formatter.hpp template Index: boost/date_time/dst_rules.hpp =================================================================== ---- boost/date_time/dst_rules.hpp.orig 2008-02-27 21:00:24.000000000 +0100 -+++ boost/date_time/dst_rules.hpp 2011-02-24 14:26:29.327698584 +0100 +--- boost/date_time/dst_rules.hpp.orig 2012-03-13 17:20:43.831945305 +0100 ++++ boost/date_time/dst_rules.hpp 2012-03-13 17:22:18.820680785 +0100 @@ -94,7 +94,7 @@ namespace boost { * @param dst_start_offset Time offset within day for dst boundary * @param dst_end_day Ending day of dst for the given locality @@ -134,8 +134,8 @@ Index: boost/date_time/dst_rules.hpp static time_is_dst_result Index: boost/date_time/strings_from_facet.hpp =================================================================== ---- boost/date_time/strings_from_facet.hpp.orig 2009-02-01 12:29:43.000000000 +0100 -+++ boost/date_time/strings_from_facet.hpp 2011-02-24 14:26:29.368695980 +0100 +--- boost/date_time/strings_from_facet.hpp.orig 2012-03-13 17:20:43.831945305 +0100 ++++ boost/date_time/strings_from_facet.hpp 2012-03-13 17:22:18.820680785 +0100 @@ -21,8 +21,9 @@ namespace boost { namespace date_time { * all the month strings from a locale. This is handy when building * custom date parsers or formatters that need to be localized. @@ -162,8 +162,8 @@ Index: boost/date_time/strings_from_facet.hpp * false for long strings. Index: boost/date_time/time_zone_names.hpp =================================================================== ---- boost/date_time/time_zone_names.hpp.orig 2008-02-27 21:00:24.000000000 +0100 -+++ boost/date_time/time_zone_names.hpp 2011-02-24 14:26:29.393694393 +0100 +--- boost/date_time/time_zone_names.hpp.orig 2012-03-13 17:20:43.832945281 +0100 ++++ boost/date_time/time_zone_names.hpp 2012-03-13 17:22:18.820680785 +0100 @@ -43,7 +43,7 @@ namespace date_time { * name: Pacific Standard Time and the abbreviated name: PST. * During daylight savings there are additional names: @@ -175,21 +175,24 @@ Index: boost/date_time/time_zone_names.hpp class time_zone_names_base Index: boost/intrusive/linear_slist_algorithms.hpp =================================================================== ---- boost/intrusive/linear_slist_algorithms.hpp.orig 2009-10-15 20:46:26.000000000 +0200 -+++ boost/intrusive/linear_slist_algorithms.hpp 2011-02-24 14:26:29.437691597 +0100 -@@ -62,7 +62,7 @@ class linear_slist_algorithms +--- boost/intrusive/linear_slist_algorithms.hpp.orig 2012-03-13 17:20:43.832945281 +0100 ++++ boost/intrusive/linear_slist_algorithms.hpp 2012-03-13 17:22:18.820680785 +0100 +@@ -60,9 +60,9 @@ class linear_slist_algorithms - //! Effects: Constructs an non-used list element, putting the next + #if defined(BOOST_INTRUSIVE_DOXYGEN_INVOKED) + +- //! Effects: Constructs an non-used list element, putting the next ++ //! Effects: Constructs n non-used list element, putting the next //! pointer to null: -- //! NodeTraits::get_next(this_node) == 0 +- //! NodeTraits::get_next(this_node) == node_ptr() + //! NodeTraits::get_next(this_node) == 0 //! //! Complexity: Constant //! Index: boost/mpi/collectives.hpp =================================================================== ---- boost/mpi/collectives.hpp.orig 2007-11-25 19:07:19.000000000 +0100 -+++ boost/mpi/collectives.hpp 2011-02-24 14:26:29.476689122 +0100 +--- boost/mpi/collectives.hpp.orig 2012-03-13 17:20:43.832945281 +0100 ++++ boost/mpi/collectives.hpp 2012-03-13 17:22:18.820680785 +0100 @@ -219,10 +219,6 @@ all_to_all(const communicator& comm, con * non-roots will reshape the objects held in their proxies based on * the skeleton sent from the root. @@ -214,8 +217,8 @@ Index: boost/mpi/collectives.hpp void broadcast(const communicator& comm, T* values, int n, int root); Index: boost/mpi/operations.hpp =================================================================== ---- boost/mpi/operations.hpp.orig 2007-11-25 19:07:19.000000000 +0100 -+++ boost/mpi/operations.hpp 2011-02-24 14:26:29.501687533 +0100 +--- boost/mpi/operations.hpp.orig 2012-03-13 17:20:43.832945281 +0100 ++++ boost/mpi/operations.hpp 2012-03-13 17:22:18.820680785 +0100 @@ -13,7 +13,7 @@ * This header provides a mapping from function objects to @c MPI_Op * constants used in MPI collective operations. It also provides @@ -227,8 +230,8 @@ Index: boost/mpi/operations.hpp #define BOOST_MPI_IS_MPI_OP_HPP Index: boost/program_options/value_semantic.hpp =================================================================== ---- boost/program_options/value_semantic.hpp.orig 2010-01-08 22:00:57.000000000 +0100 -+++ boost/program_options/value_semantic.hpp 2011-02-24 14:26:29.552684294 +0100 +--- boost/program_options/value_semantic.hpp.orig 2012-03-13 17:20:43.832945281 +0100 ++++ boost/program_options/value_semantic.hpp 2012-03-13 17:22:18.820680785 +0100 @@ -385,7 +385,7 @@ namespace boost { namespace program_opti typed_value* wvalue(T* v); @@ -240,8 +243,8 @@ Index: boost/program_options/value_semantic.hpp */ Index: libs/mpi/doc/mpi.qbk =================================================================== ---- libs/mpi/doc/mpi.qbk.orig 2009-08-06 21:04:54.000000000 +0200 -+++ libs/mpi/doc/mpi.qbk 2011-02-24 14:26:29.694675277 +0100 +--- libs/mpi/doc/mpi.qbk.orig 2012-03-13 17:20:43.832945281 +0100 ++++ libs/mpi/doc/mpi.qbk 2012-03-13 17:22:18.821680761 +0100 @@ -1846,7 +1846,7 @@ routine, e.g., `skeleton_proxy` objects can be received on the other end via `recv()`, diff --git a/boost-no_type_punning.patch b/boost-no_type_punning.patch index 9c65b0c..a9a12ae 100644 --- a/boost-no_type_punning.patch +++ b/boost-no_type_punning.patch @@ -1,7 +1,7 @@ Index: libs/python/src/dict.cpp =================================================================== --- libs/python/src/dict.cpp.orig 2009-10-14 00:37:59.000000000 +0200 -+++ libs/python/src/dict.cpp 2010-03-24 14:16:38.455514855 +0100 ++++ libs/python/src/dict.cpp 2012-03-13 17:20:34.286172759 +0100 @@ -28,9 +28,9 @@ namespace detail::new_reference dict_base::call(object const& arg_) @@ -17,7 +17,7 @@ Index: libs/python/src/dict.cpp Index: libs/python/src/list.cpp =================================================================== --- libs/python/src/list.cpp.orig 2009-10-14 00:37:59.000000000 +0200 -+++ libs/python/src/list.cpp 2010-03-24 14:17:39.063512971 +0100 ++++ libs/python/src/list.cpp 2012-03-13 17:20:34.286172759 +0100 @@ -10,11 +10,11 @@ namespace boost { namespace python { nam detail::new_non_null_reference list_base::call(object const& arg_) @@ -35,7 +35,7 @@ Index: libs/python/src/list.cpp Index: libs/python/src/long.cpp =================================================================== --- libs/python/src/long.cpp.orig 2009-08-17 23:01:18.000000000 +0200 -+++ libs/python/src/long.cpp 2010-03-24 14:27:51.795442249 +0100 ++++ libs/python/src/long.cpp 2012-03-13 17:20:34.287172735 +0100 @@ -8,16 +8,16 @@ namespace boost { namespace python { nam new_non_null_reference long_base::call(object const& arg_) @@ -73,9 +73,9 @@ Index: libs/python/src/long.cpp : object(long_base::call(arg)) Index: libs/python/src/object/class.cpp =================================================================== ---- libs/python/src/object/class.cpp.orig 2009-11-13 01:40:01.000000000 +0100 -+++ libs/python/src/object/class.cpp 2010-03-24 14:22:47.359006204 +0100 -@@ -615,9 +615,11 @@ namespace objects +--- libs/python/src/object/class.cpp.orig 2011-06-07 06:15:33.000000000 +0200 ++++ libs/python/src/object/class.cpp 2012-03-13 17:20:34.287172735 +0100 +@@ -616,9 +616,11 @@ namespace objects void class_base::add_property( char const* name, object const& fget, char const* docstr) { @@ -88,7 +88,7 @@ Index: libs/python/src/object/class.cpp this->setattr(name, property); } -@@ -625,9 +627,11 @@ namespace objects +@@ -626,9 +628,11 @@ namespace objects void class_base::add_property( char const* name, object const& fget, object const& fset, char const* docstr) { @@ -104,7 +104,7 @@ Index: libs/python/src/object/class.cpp Index: libs/python/src/str.cpp =================================================================== --- libs/python/src/str.cpp.orig 2009-10-14 00:37:59.000000000 +0200 -+++ libs/python/src/str.cpp 2010-03-24 14:25:54.499013435 +0100 ++++ libs/python/src/str.cpp 2012-03-13 17:20:34.287172735 +0100 @@ -9,14 +9,14 @@ namespace boost { namespace python { nam detail::new_reference str_base::call(object const& arg_) @@ -128,7 +128,7 @@ Index: libs/python/src/str.cpp Index: libs/python/src/tuple.cpp =================================================================== --- libs/python/src/tuple.cpp.orig 2009-08-17 23:01:18.000000000 +0200 -+++ libs/python/src/tuple.cpp 2010-03-24 14:36:48.547503422 +0100 ++++ libs/python/src/tuple.cpp 2012-03-13 17:20:34.287172735 +0100 @@ -8,9 +8,10 @@ namespace boost { namespace python { nam detail::new_reference tuple_base::call(object const& arg_) diff --git a/boost-sane_versioning.patch b/boost-sane_versioning.patch deleted file mode 100644 index e5ab4a3..0000000 --- a/boost-sane_versioning.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: Jamroot -=================================================================== ---- 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 -- -$(BOOST_VERSION_TAG) -- -$(BUILD_ID) -- : $(name) : $(type) : $(property-set) ] ; -+ : $(name) : $(type) : $(property-set) ] ; - } - else if $(layout) = tagged - { -@@ -527,13 +525,9 @@ if $(layout-versioned) && ( [ modules.pe - return $(result) ; - } - -- generate stage-unversioned : stage-proper : -- @make-unversioned-links ; -- explicit stage-unversioned ; -- -- generate install-unversioned : install-proper : -- @make-unversioned-links ; -- explicit install-unversioned ; -+ # Create do-nothing aliases -+ alias stage-unversioned ; -+ alias install-unversioned ; - } - else - { diff --git a/boost-strict_aliasing.patch b/boost-strict_aliasing.patch index ef98759..1aa8674 100644 --- a/boost-strict_aliasing.patch +++ b/boost-strict_aliasing.patch @@ -10,21 +10,3 @@ Index: libs/python/build/Jamfile.v2 ; rule tag ( name : type ? : property-set ) -Index: boost/function/function_base.hpp -=================================================================== ---- 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); - - if (op == move_functor_tag) { -- reinterpret_cast(&in_buffer.data)->~Functor(); -+ reinterpret_cast(&in_buffer)->~Functor(); - } - } else if (op == destroy_functor_tag) { - // Some compilers (Borland, vc6, ...) are unhappy with ~functor_type. -- reinterpret_cast(&out_buffer.data)->~Functor(); -+ reinterpret_cast(&out_buffer)->~Functor(); - } else if (op == check_functor_type_tag) { - const detail::sp_typeinfo& check_type - = *out_buffer.type.type; diff --git a/boost-use_std_xml_catalog.patch b/boost-use_std_xml_catalog.patch index 852a3c9..fdbce11 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 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 +--- tools/build/v2/tools/boostbook.jam.orig 2011-06-06 22:36:21.000000000 +0200 ++++ tools/build/v2/tools/boostbook.jam 2012-03-13 17:20:34.311172162 +0100 +@@ -491,40 +491,7 @@ rule generate-xml-catalog ( target : sou " " : true ; diff --git a/boost.changes b/boost.changes index 8af1968..1ee0918 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Sat Mar 17 17:58:21 UTC 2012 - jengelh@medozas.de + +- Adjust Require for new libxslt-tools + +------------------------------------------------------------------- +Tue Mar 13 12:45:31 CET 2012 - pth@suse.de + +- Update to 1.49.0. Major changes since 1.46.1: + + New libraries: + * Heap. + * Container + * Locale + * Move + * Chrono + * Geometry + * Phoenix + * Ratio + + For a detailed descriptions see + http://www.boost.org/users/history/version_1_47_0.html + http://www.boost.org/users/history/version_1_48_0.html + http://www.boost.org/users/history/version_1_49_0.html + +- Rebuilt the man documentation with gcc 4.5 as the current gcc + segfaults when building quickbook. +- Package PDF documentation independent of whether we build it + ourselves. +- Fix missing function return in Boost::Chrono's process_cpu_clocks.hpp + ------------------------------------------------------------------- Mon Feb 13 10:44:37 UTC 2012 - coolo@suse.com diff --git a/boost.spec b/boost.spec index 2b7340a..fe76529 100644 --- a/boost.spec +++ b/boost.spec @@ -16,22 +16,22 @@ # -Version: 1.46.1 -Release: 0 -%define file_version 1_46_1 -%define short_version 1_46 -%define lib_appendix 1_46_1 +%define ver 1.49.0 +%define file_version 1_49_0 +%define short_version 1_49 +%define lib_appendix 1_49_0 #Only define to 1 to generate the man pages %define build_docs 0 #Define to 0 to not generate the pdf documentation -%define build_pdf 1 +%define build_pdf 0 +%define package_pdf 1 # Just hardcode build_mpi to 1 as soon as openmpi builds on all # named architectures. -%ifarch s390 s390x ia64 hppa %arm +%ifarch s390 s390x ia64 hppa %define build_mpi 0 %else %define build_mpi 1 @@ -48,9 +48,10 @@ Release: 0 %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 boost_libs6 libboost_random%{lib_appendix} +%define boost_libs6 libboost_random%{lib_appendix} libboost_chrono%{lib_appendix} libboost_locale%{lib_appendix} +%define boost_libs7 libboost_timer%{lib_appendix} -%define most_libs %boost_libs1 %boost_libs2 %boost_libs3 %boost_libs4 %boost_libs5 %boost_libs6 +%define most_libs %boost_libs1 %boost_libs2 %boost_libs3 %boost_libs4 %boost_libs5 %boost_libs6 %boost_libs7 %if %build_mpi %define all_libs %{most_libs} libboost_mpi%{lib_appendix} @@ -78,7 +79,7 @@ BuildRequires: openmpi-devel BuildRequires: docbook BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen -BuildRequires: libxslt +BuildRequires: libxslt-tools BuildRequires: python-devel BuildRequires: texlive-latex %endif @@ -90,20 +91,21 @@ Summary: Boost C++ Libraries License: BSD-3-Clause Group: Development/Libraries/C and C++ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %{name}_%{file_version}.tar.xz +Version: 1.49.0 +Release: 0 +Source0: %{name}_%{file_version}.tar.bz2 Source1: boost-rpmlintrc Source2: %{name}_%{short_version}_man.tar.xz Source3: %{name}_%{short_version}_pdf.tar.xz Source4: existing_extra_docs -Source5: NEWS +#Source5: NEWS Patch1: boost-thread.patch Patch2: boost-no_type_punning.patch Patch8: boost-no_segfault_in_Regex_filter.patch -Patch9: boost-fix-spirit-attr-handling.patch -Patch19: boost-sane_versioning.patch Patch20: boost-strict_aliasing.patch Patch50: boost-use_std_xml_catalog.patch Patch51: boost-fix_documentation.patch +Patch52: boost-chrono_add_function_return.patch Recommends: %{all_libs} %define _docdir %{_datadir}/doc/packages/boost-%{version} @@ -142,6 +144,7 @@ the documentation packages (html, man or pdf). %package -n boost-license%{lib_appendix} + Summary: Boost License Group: Development/Libraries/C and C++ Provides: boost-license = %{version}-%{release} @@ -158,7 +161,6 @@ This package contains the license boost is provided under. %package doc-html Summary: HTML documentation for the Boost C++ Libraries Group: Development/Libraries/C and C++ -Requires: boost-license%{lib_appendix} %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif @@ -181,7 +183,7 @@ This package contains the documentation of the boost dynamic libraries as man pages. -%if %build_pdf +%if %package_pdf %package doc-pdf Summary: PDF documentation for the Boost C++ Libraries @@ -196,16 +198,17 @@ in PDF format. %endif %package -n libboost_date_time%{lib_appendix} + Summary: Boost::Date.Time Runtime libraries Group: System/Libraries Requires: boost-license%{lib_appendix} -%description -n libboost_date_time%{lib_appendix} +%description -n libboost_date_time%{lib_appendix} This package contains the Boost Date.Time runtime libraries. +%package -n libboost_filesystem%{lib_appendix} -%package -n libboost_filesystem%{lib_appendix} Summary: Boost::Filesystem Runtime Libraries Group: System/Localization Requires: boost-license%{lib_appendix} @@ -214,8 +217,8 @@ Requires: boost-license%{lib_appendix} This package contains the Boost::Filesystem libraries. - %package -n libboost_graph%{lib_appendix} + Summary: Boost::Graph Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} @@ -224,8 +227,8 @@ Requires: boost-license%{lib_appendix} This package contains the Boost::Graph Runtime libraries. - %package -n libboost_iostreams%{lib_appendix} + Summary: Boost::IOStreams Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} @@ -234,8 +237,8 @@ Requires: boost-license%{lib_appendix} This package contains the Boost::IOStreams Runtime libraries. - %package -n libboost_math%{lib_appendix} + Summary: Boost::Math Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} @@ -247,6 +250,7 @@ This package contains the Boost::Math Runtime libraries. %if %build_mpi %package -n libboost_mpi%{lib_appendix} + Summary: Boost::MPI Runtime libraries Group: System/Libraries Requires: boost-license%{lib_appendix} @@ -257,6 +261,7 @@ This package contains the Boost::MPI Runtime libraries. %endif %package -n libboost_test%{lib_appendix} + Summary: Boost::Test Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} @@ -265,8 +270,8 @@ Requires: boost-license%{lib_appendix} This package contains the Boost::Test runtime libraries. - %package -n libboost_program_options%{lib_appendix} + Summary: Boost::ProgramOptions Runtime libraries Group: System/Libraries Requires: boost-license%{lib_appendix} @@ -275,8 +280,8 @@ Requires: boost-license%{lib_appendix} This package contains the Boost::ProgramOptions Runtime libraries. - %package -n libboost_python%{lib_appendix} + Summary: Boost::Python Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} @@ -285,8 +290,8 @@ Requires: boost-license%{lib_appendix} This package contains the Boost::Python Runtime libraries. - %package -n libboost_serialization%{lib_appendix} + Summary: Boost::Serialization Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} @@ -295,8 +300,8 @@ Requires: boost-license%{lib_appendix} This package contains the Boost::Serialization Runtime libraries. - %package -n libboost_signals%{lib_appendix} + Summary: Boost::Signals Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} @@ -305,8 +310,8 @@ Requires: boost-license%{lib_appendix} This package contains the Boost::Signals Runtime libraries. - %package -n libboost_system%{lib_appendix} + Summary: Boost::System Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} @@ -315,8 +320,8 @@ Requires: boost-license%{lib_appendix} This package contains the Boost::System runtime libraries. - %package -n libboost_thread%{lib_appendix} + Summary: Boost::Thread Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} @@ -325,8 +330,8 @@ Requires: boost-license%{lib_appendix} This package contains the Boost::Thread runtime libraries. - %package -n libboost_wave%{lib_appendix} + Summary: Boost::Wave Runtime Libraries Group: System/Libraries Requires: boost-license%{lib_appendix} @@ -335,8 +340,8 @@ Requires: boost-license%{lib_appendix} This package contains the Boost::Wave runtime libraries. - %package -n libboost_regex%{lib_appendix} + Summary: The Boost::Regex runtime library Group: System/Libraries Requires: boost-license%{lib_appendix} @@ -345,13 +350,40 @@ Requires: boost-license%{lib_appendix} This package contains the Boost::Regex runtime library. %package -n libboost_random%{lib_appendix} + Summary: The Boost::Random runtime library Group: System/Libraries Requires: boost-license%{lib_appendix} %description -n libboost_random%{lib_appendix} -This package contains the Boost:Random runtime library. +This package contains the Boost::Random runtime library. +%package -n libboost_chrono%{lib_appendix} + +Summary: The Boost::Chrono runtime library +Group: System/Libraries +Requires: boost-license%{lib_appendix} + +%description -n libboost_chrono%{lib_appendix} +This package contains the Boost::Chrono runtime library. + +%package -n libboost_locale%{lib_appendix} + +Summary: The Boost::Locale runtime library +Group: System/Libraries +Requires: boost-license%{lib_appendix} + +%description -n libboost_locale%{lib_appendix} +This package contains the Boost::Locale runtime library. + +%package -n libboost_timer%{lib_appendix} + +Summary: The Boost::Timer runtime library +Group: System/Libraries +Requires: boost-license%{lib_appendix} + +%description -n libboost_timer%{lib_appendix} +This package contains the Boost::Timer runtime library. %prep @@ -365,11 +397,12 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} %patch1 %patch2 %patch8 -%patch9 -%patch19 +#%%patch9 +#%%patch19 %patch20 %patch50 %patch51 +%patch52 #stupid build machinery copies .orig files find . -name \*.orig -exec rm {} + @@ -419,11 +452,9 @@ EOF cat << EOF >>user-config.jam using xsltproc ; -using boostbook ; +using boostbook : /usr/share/xml/docbook/stylesheet/nwalsh/current ; using doxygen ; - -using fop : /usr/bin/fop ; EOF %endif @@ -445,7 +476,7 @@ cd doc %endif %install -# Now install it +# Now build it J_P=%{jobs} J_G=$(getconf _NPROCESSORS_ONLN) [ $J_G -gt 64 ] && J_G=64 @@ -481,7 +512,7 @@ source /var/mpi-selector/data/$(rpm --qf "%{NAME}-%{VERSION}" -q openmpi).sh --exec-prefix=$%{buildroot}%{_prefix} \ --libdir=%{buildroot}%{_libdir} \ --includedir=%{buildroot}%{_includedir} \ - install || echo "Not all Boost libraries installed properly." + install || echo "Not all Boost libraries built properly." mkdir -p %{buildroot}%{_docdir} @@ -511,10 +542,6 @@ popd install -d %buildroot/%{_docdir}/pdf install -p -m 644 ../%{name}_%{short_version}_pdf/*.pdf %{buildroot}/%{_docdir}/pdf/ -#install autoconf macros -#install -d %{buildroot}%{_datadir}/aclocal -#install -m 644 m4/*.m4 %{buildroot}%{_datadir}/aclocal - #install doc files dos2unix libs/ptr_container/doc/tutorial_example.html \ libs/parameter/doc/html/reference.html \ @@ -529,7 +556,7 @@ rm -rf %{buildroot}%{_docdir}/boost ln -s /usr/include/boost %{buildroot}%{_docdir} ln -s ../LICENSE_1_0.txt %{buildroot}%{_docdir}/libs #Copy the news file. -cp %{S:5} %{buildroot}%{_docdir} +#cp %%{S:5} %%{buildroot}%%{_docdir} #only for documentation, doesn't need to be executable find %{buildroot}%{_docdir} -name \*.py -exec chmod -x {} + rm -f %{buildroot}%{_libdir}/*.a @@ -539,77 +566,59 @@ rm -f %{buildroot}%{_libdir}/*.a %endif %post -n libboost_date_time%{lib_appendix} -p /sbin/ldconfig - %post -n libboost_filesystem%{lib_appendix} -p /sbin/ldconfig - %post -n libboost_iostreams%{lib_appendix} -p /sbin/ldconfig - %post -n libboost_test%{lib_appendix} -p /sbin/ldconfig - %post -n libboost_program_options%{lib_appendix} -p /sbin/ldconfig - %post -n libboost_python%{lib_appendix} -p /sbin/ldconfig - %post -n libboost_regex%{lib_appendix} -p /sbin/ldconfig - %post -n libboost_serialization%{lib_appendix} -p /sbin/ldconfig - %post -n libboost_signals%{lib_appendix} -p /sbin/ldconfig - %post -n libboost_thread%{lib_appendix} -p /sbin/ldconfig - %post -n libboost_math%{lib_appendix} -p /sbin/ldconfig -%if %build_mpi +%if %build_mpi %post -n libboost_mpi%{lib_appendix} -p /sbin/ldconfig %endif %post -n libboost_graph%{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_random%{lib_appendix} -p /sbin/ldconfig +%post -n libboost_chrono%{lib_appendix} -p /sbin/ldconfig +%post -n libboost_locale%{lib_appendix} -p /sbin/ldconfig +%post -n libboost_timer%{lib_appendix} -p /sbin/ldconfig + +############################## %postun -n libboost_date_time%{lib_appendix} -p /sbin/ldconfig - %postun -n libboost_filesystem%{lib_appendix} -p /sbin/ldconfig - %postun -n libboost_iostreams%{lib_appendix} -p /sbin/ldconfig - %postun -n libboost_test%{lib_appendix} -p /sbin/ldconfig - %postun -n libboost_program_options%{lib_appendix} -p /sbin/ldconfig - %postun -n libboost_python%{lib_appendix} -p /sbin/ldconfig - %postun -n libboost_regex%{lib_appendix} -p /sbin/ldconfig - %postun -n libboost_serialization%{lib_appendix} -p /sbin/ldconfig - %postun -n libboost_signals%{lib_appendix} -p /sbin/ldconfig - %postun -n libboost_thread%{lib_appendix} -p /sbin/ldconfig - %postun -n libboost_math%{lib_appendix} -p /sbin/ldconfig -%if %build_mpi +%if %build_mpi %postun -n libboost_mpi%{lib_appendix} -p /sbin/ldconfig %endif %postun -n libboost_graph%{lib_appendix} -p /sbin/ldconfig - %postun -n libboost_system%{lib_appendix} -p /sbin/ldconfig - %postun -n libboost_wave%{lib_appendix} -p /sbin/ldconfig - %postun -n libboost_random%{lib_appendix} -p /sbin/ldconfig +%postun -n libboost_chrono%{lib_appendix} -p /sbin/ldconfig +%postun -n libboost_locale%{lib_appendix} -p /sbin/ldconfig +%postun -n libboost_timer%{lib_appendix} -p /sbin/ldconfig %files -n boost-license%{lib_appendix} %defattr(-, root, root, -) %dir %{_docdir} -%doc %{_docdir}/NEWS +#%%doc %%{_docdir}/NEWS %doc %{_docdir}/LICENSE_1_0.txt %files -n libboost_date_time%{lib_appendix} @@ -681,6 +690,18 @@ rm -f %{buildroot}%{_libdir}/*.a %defattr(-, root, root, -) %{_libdir}/libboost_random*.so.* +%files -n libboost_chrono%{lib_appendix} +%defattr(-, root, root, -) +%{_libdir}/libboost_chrono*.so.* + +%files -n libboost_locale%{lib_appendix} +%defattr(-, root, root, -) +%{_libdir}/libboost_locale*.so.* + +%files -n libboost_timer%{lib_appendix} +%defattr(-, root, root, -) +%{_libdir}/libboost_timer*.so.* + %files devel %defattr(-, root, root, -) %{_includedir}/boost @@ -694,9 +715,7 @@ rm -f %{buildroot}%{_libdir}/*.a %defattr(-, root, root, -) %doc %{_docdir}/* %exclude %{_docdir}/pdf -# part of license package -%exclude %doc %{_docdir}/NEWS -%exclude %doc %{_docdir}/LICENSE_1_0.txt +%exclude %{_docdir}/LICENSE_1_0.txt %files doc-man %defattr(644, root, root, -) @@ -704,7 +723,7 @@ rm -f %{buildroot}%{_libdir}/*.a %doc %{_mandir}/man7/*.7.gz %doc %{_mandir}/man9/*.9.gz -%if %build_pdf +%if %package_pdf %files doc-pdf %defattr(-, root, root, -) diff --git a/boost_1_46_1.tar.xz b/boost_1_46_1.tar.xz deleted file mode 100644 index 05290f1..0000000 --- a/boost_1_46_1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8a7ace5fe211422160c5370939661c8c01f8868f945d6f263b1ae67674d7396a -size 36397580 diff --git a/boost_1_46_man.tar.xz b/boost_1_46_man.tar.xz deleted file mode 100644 index 5b5686e..0000000 --- a/boost_1_46_man.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:126b91dc2fbacf2a7d63d79fcb95d8647089bd13b2b1a481e2469c2867fb1c29 -size 366780 diff --git a/boost_1_46_pdf.tar.xz b/boost_1_46_pdf.tar.xz deleted file mode 100644 index 5e1cb7a..0000000 --- a/boost_1_46_pdf.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cff35bfe1bd99e10914e2fb7e7ca44d9a0074d0480ff261e4b7884ad7b3d2ea2 -size 26107456 diff --git a/boost_1_49_0.tar.bz2 b/boost_1_49_0.tar.bz2 new file mode 100644 index 0000000..02fee54 --- /dev/null +++ b/boost_1_49_0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd748a7f5507a7e7af74f452e1c52a64e651ed1f7263fce438a06641d2180d3c +size 48499961 diff --git a/boost_1_49_man.tar.xz b/boost_1_49_man.tar.xz new file mode 100644 index 0000000..2ea1428 --- /dev/null +++ b/boost_1_49_man.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2bc5dc84bf438e935593cd721275cb6a9bb64cc59c7f68841d36aea589830a12 +size 408676 diff --git a/boost_1_49_pdf.tar.xz b/boost_1_49_pdf.tar.xz new file mode 100644 index 0000000..ef6a03c --- /dev/null +++ b/boost_1_49_pdf.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:adf413b5771545ba1b0b61c4e4e8151639b6e3beb7d097fa504dad10e59e04ab +size 28755588