From 908d7d2963827ccc4087022dd06285fc9b1b4e88 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Fri, 8 May 2009 01:11:25 +0000 Subject: [PATCH] - Update release. Wed May 06 2009 Benjamin Kosnik - 1.39.0-0.3 - Fixes for rpmlint. Wed May 06 2009 Petr Machata - 1.39.0-0.2 - Split up boost package to sub-packages per library - Resolves: #496188 Wed May 06 2009 Benjamin Kosnik - 1.39.0-0.1 - Rebase to 1.39.0. - Add --with docs_generated. - #225622: Substitute optflags at prep time instead of RPM_OPT_FLAGS. --- .cvsignore | 2 +- boost-1_37_0-smp.patch | 12 -- boost-bitset.patch | 4 +- boost-configure.patch | 38 ----- boost-function_template.patch | 14 -- boost-gcc-soname.patch | 21 --- boost-gcc43.patch | 157 ------------------ boost-soname.patch | 37 +++++ boost-use-rpm-optflags.patch | 2 +- boost-version-override.patch | 36 +++++ boost.spec | 295 +++++++++++++++++++++++++++++----- import.log | 1 + sources | 2 +- 13 files changed, 338 insertions(+), 283 deletions(-) delete mode 100644 boost-1_37_0-smp.patch delete mode 100644 boost-configure.patch delete mode 100644 boost-function_template.patch delete mode 100644 boost-gcc-soname.patch delete mode 100644 boost-gcc43.patch create mode 100644 boost-soname.patch create mode 100644 boost-version-override.patch diff --git a/.cvsignore b/.cvsignore index 0f28482..9b0169e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -boost_1_37_0.tar.bz2 +boost_1_39_0.tar.bz2 diff --git a/boost-1_37_0-smp.patch b/boost-1_37_0-smp.patch deleted file mode 100644 index b753bea..0000000 --- a/boost-1_37_0-smp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up boost_1_37_0/configure.smp boost_1_37_0/configure ---- boost_1_37_0/configure.smp 2009-02-05 18:49:01.000000000 +0100 -+++ boost_1_37_0/configure 2009-02-05 18:53:55.000000000 +0100 -@@ -347,7 +347,7 @@ LIBS=$LIBS - - all: .dummy - @echo "\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS) stage" -- @\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS) stage || \\ -+ @\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS) !!!SMP_FLAGS!!! stage || \\ - echo "Not all Boost libraries built properly." - - clean: .dummy diff --git a/boost-bitset.patch b/boost-bitset.patch index 1d354aa..66ef16f 100644 --- a/boost-bitset.patch +++ b/boost-bitset.patch @@ -1,5 +1,5 @@ ---- boost_1_37_0/boost/dynamic_bitset/dynamic_bitset.hpp.debug 2008-10-22 03:13:59.000000000 +0900 -+++ boost_1_37_0/boost/dynamic_bitset/dynamic_bitset.hpp 2009-03-23 03:36:40.000000000 +0900 +--- boost/dynamic_bitset/dynamic_bitset.hpp.debug 2008-10-22 03:13:59.000000000 +0900 ++++ boost/dynamic_bitset/dynamic_bitset.hpp 2009-03-23 03:36:40.000000000 +0900 @@ -1017,8 +1017,11 @@ ? access_by_bytes : access_by_blocks; diff --git a/boost-configure.patch b/boost-configure.patch deleted file mode 100644 index 91e8508..0000000 --- a/boost-configure.patch +++ /dev/null @@ -1,38 +0,0 @@ -*** configure.orig 2007-01-16 01:39:00.000000000 +0100 ---- configure 2007-01-19 03:53:08.000000000 +0100 -*************** -*** 9,15 **** - - BJAM="" - TOOLSET="" -! BJAM_CONFIG="" - BUILD="" - PREFIX=/usr/local - EPREFIX= ---- 9,15 ---- - - BJAM="" - TOOLSET="" -! BJAM_CONFIG="-d2 --layout=system variant=release threading=single,multi debug-symbols=on" - BUILD="" - PREFIX=/usr/local - EPREFIX= -*************** INCLUDEDIR=$INCLUDEDIR -*** 325,332 **** - LIBS=$LIBS - - all: .dummy -! @echo "\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS)" -! @\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS) || \\ - echo "Not all Boost libraries built properly." - - clean: .dummy ---- 325,332 ---- - LIBS=$LIBS - - all: .dummy -! @echo "\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS) stage" -! @\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS) stage || \\ - echo "Not all Boost libraries built properly." - - clean: .dummy diff --git a/boost-function_template.patch b/boost-function_template.patch deleted file mode 100644 index fa57836..0000000 --- a/boost-function_template.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- boost/function/function_template.hpp.orig 2008-12-19 10:32:27.000000000 +0000 -+++ boost/function/function_template.hpp 2008-12-19 10:33:27.000000000 +0000 -@@ -950,10 +950,10 @@ - f.vtable->manager(f.functor, this->functor, - boost::detail::function::move_functor_tag); - f.vtable = 0; --#if !defined(BOOST_NO_EXCEPTIONS) - } else { - clear(); - } -+#if !defined(BOOST_NO_EXCEPTIONS) - } catch (...) { - vtable = 0; - throw; diff --git a/boost-gcc-soname.patch b/boost-gcc-soname.patch deleted file mode 100644 index e8ab492..0000000 --- a/boost-gcc-soname.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- boost_1_36_0_beta1/tools/build/v2/tools/gcc.jam.orig 2008-08-11 13:15:13.000000000 +0200 -+++ boost_1_36_0_beta1/tools/build/v2/tools/gcc.jam 2008-08-11 15:21:05.000000000 +0200 -@@ -336,7 +336,8 @@ - # OSF does have an option called -soname but it does not seem to work as - # expected, therefore it has been disabled. - HAVE_SONAME = "" ; -- SONAME_OPTION = -h ; -+ SONAME_OPTION = -soname ; -+ SONAME_VERSION = !!!SONAME!!! ; - } - - -@@ -726,7 +727,7 @@ - # Differs from 'link' above only by -shared. - actions link.dll bind LIBRARIES - { -- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) -+ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=).$(SONAME_VERSION) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) - } - - rule setup-threading ( targets * : sources * : properties * ) diff --git a/boost-gcc43.patch b/boost-gcc43.patch deleted file mode 100644 index 7b1f999..0000000 --- a/boost-gcc43.patch +++ /dev/null @@ -1,157 +0,0 @@ -diff -urp boost_1_36_0_beta1-orig/boost/archive/polymorphic_iarchive.hpp boost_1_36_0_beta1/boost/archive/polymorphic_iarchive.hpp ---- boost_1_36_0_beta1-orig/boost/archive/polymorphic_iarchive.hpp 2008-08-11 23:49:44.000000000 +0200 -+++ boost_1_36_0_beta1/boost/archive/polymorphic_iarchive.hpp 2008-08-11 23:50:38.000000000 +0200 -@@ -35,6 +35,8 @@ namespace std{ - #include - #include - -+#include -+ - // determine if its necessary to handle (u)int64_t specifically - // i.e. that its not a synonym for (unsigned) long - // if there is no 64 bit int or if its the same as a long -Only in boost_1_36_0_beta1/boost/archive: polymorphic_iarchive.hpp.orig -diff -urp boost_1_36_0_beta1-orig/boost/archive/polymorphic_oarchive.hpp boost_1_36_0_beta1/boost/archive/polymorphic_oarchive.hpp ---- boost_1_36_0_beta1-orig/boost/archive/polymorphic_oarchive.hpp 2008-08-11 23:49:44.000000000 +0200 -+++ boost_1_36_0_beta1/boost/archive/polymorphic_oarchive.hpp 2008-08-11 23:50:38.000000000 +0200 -@@ -34,6 +34,8 @@ namespace std{ - #include - #include - -+#include -+ - // determine if its necessary to handle (u)int64_t specifically - // i.e. that its not a synonym for (unsigned) long - // if there is no 64 bit int or if its the same as a long -Only in boost_1_36_0_beta1/boost/archive: polymorphic_oarchive.hpp.orig -diff -urp boost_1_36_0_beta1-orig/boost/date_time/tz_db_base.hpp boost_1_36_0_beta1/boost/date_time/tz_db_base.hpp ---- boost_1_36_0_beta1-orig/boost/date_time/tz_db_base.hpp 2008-08-11 23:49:45.000000000 +0200 -+++ boost_1_36_0_beta1/boost/date_time/tz_db_base.hpp 2008-08-11 23:50:38.000000000 +0200 -@@ -158,7 +158,7 @@ namespace boost { - typedef typename time_zone_type::base_type time_zone_base_type; - typedef typename time_zone_type::time_duration_type time_duration_type; - typedef time_zone_names_base time_zone_names; -- typedef dst_adjustment_offsets dst_adjustment_offsets; -+ typedef dst_adjustment_offsets dst_adjustment_offsets_t; - typedef std::basic_string string_type; - - //! Constructs an empty database -@@ -346,18 +346,18 @@ namespace boost { - time_duration_type utc_offset = - str_from_delimited_time_duration(result[GMTOFFSET]); - -- dst_adjustment_offsets adjust(time_duration_type(0,0,0), -- time_duration_type(0,0,0), -- time_duration_type(0,0,0)); -+ dst_adjustment_offsets_t adjust(time_duration_type(0,0,0), -+ time_duration_type(0,0,0), -+ time_duration_type(0,0,0)); - - boost::shared_ptr rules; - - if(has_dst){ -- adjust = dst_adjustment_offsets( -- str_from_delimited_time_duration(result[DSTADJUST]), -- str_from_delimited_time_duration(result[START_TIME]), -- str_from_delimited_time_duration(result[END_TIME]) -- ); -+ adjust = dst_adjustment_offsets_t( -+ str_from_delimited_time_duration(result[DSTADJUST]), -+ str_from_delimited_time_duration(result[START_TIME]), -+ str_from_delimited_time_duration(result[END_TIME]) -+ ); - - rules = - boost::shared_ptr(parse_rules(result[START_DATE_RULE], -Only in boost_1_36_0_beta1/boost/date_time: tz_db_base.hpp.orig -diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_creator.hpp boost_1_36_0_beta1/boost/regex/v4/basic_regex_creator.hpp ---- boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_creator.hpp 2008-08-11 23:49:48.000000000 +0200 -+++ boost_1_36_0_beta1/boost/regex/v4/basic_regex_creator.hpp 2008-08-11 23:50:38.000000000 +0200 -@@ -36,6 +36,8 @@ - # pragma warning(disable: 4800) - #endif - -+#include -+ - namespace boost{ - - namespace re_detail{ -Only in boost_1_36_0_beta1/boost/regex/v4: basic_regex_creator.hpp.orig -diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex.hpp boost_1_36_0_beta1/boost/regex/v4/basic_regex.hpp ---- boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex.hpp 2008-08-11 23:49:48.000000000 +0200 -+++ boost_1_36_0_beta1/boost/regex/v4/basic_regex.hpp 2008-08-11 23:50:38.000000000 +0200 -@@ -30,6 +30,8 @@ - #pragma warning(pop) - #endif - -+#include -+ - namespace boost{ - #ifdef BOOST_MSVC - #pragma warning(push) -Only in boost_1_36_0_beta1/boost/regex/v4: basic_regex.hpp.orig -diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_parser.hpp boost_1_36_0_beta1/boost/regex/v4/basic_regex_parser.hpp ---- boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_parser.hpp 2008-08-11 23:49:48.000000000 +0200 -+++ boost_1_36_0_beta1/boost/regex/v4/basic_regex_parser.hpp 2008-08-11 23:50:38.000000000 +0200 -@@ -30,6 +30,8 @@ - #pragma warning(pop) - #endif - -+#include -+ - namespace boost{ - namespace re_detail{ - -Only in boost_1_36_0_beta1/boost/regex/v4: basic_regex_parser.hpp.orig -diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/perl_matcher.hpp boost_1_36_0_beta1/boost/regex/v4/perl_matcher.hpp ---- boost_1_36_0_beta1-orig/boost/regex/v4/perl_matcher.hpp 2008-08-11 23:49:48.000000000 +0200 -+++ boost_1_36_0_beta1/boost/regex/v4/perl_matcher.hpp 2008-08-11 23:50:38.000000000 +0200 -@@ -30,6 +30,8 @@ - # pragma warning(disable: 4800) - #endif - -+#include -+ - namespace boost{ - namespace re_detail{ - -Only in boost_1_36_0_beta1/boost/regex/v4: perl_matcher.hpp.orig -diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/regex_split.hpp boost_1_36_0_beta1/boost/regex/v4/regex_split.hpp ---- boost_1_36_0_beta1-orig/boost/regex/v4/regex_split.hpp 2008-08-11 23:49:48.000000000 +0200 -+++ boost_1_36_0_beta1/boost/regex/v4/regex_split.hpp 2008-08-11 23:50:38.000000000 +0200 -@@ -21,6 +21,8 @@ - #ifndef BOOST_REGEX_SPLIT_HPP - #define BOOST_REGEX_SPLIT_HPP - -+#include -+ - namespace boost{ - - #ifdef BOOST_MSVC -Only in boost_1_36_0_beta1/boost/regex/v4: regex_split.hpp.orig -diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/states.hpp boost_1_36_0_beta1/boost/regex/v4/states.hpp ---- boost_1_36_0_beta1-orig/boost/regex/v4/states.hpp 2008-08-11 23:49:48.000000000 +0200 -+++ boost_1_36_0_beta1/boost/regex/v4/states.hpp 2008-08-11 23:50:38.000000000 +0200 -@@ -30,6 +30,8 @@ - #pragma warning(pop) - #endif - -+#include -+ - namespace boost{ - namespace re_detail{ - -Only in boost_1_36_0_beta1/boost/regex/v4: states.hpp.orig -diff -urp boost_1_36_0_beta1-orig/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp boost_1_36_0_beta1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp ---- boost_1_36_0_beta1-orig/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-08-11 23:49:45.000000000 +0200 -+++ boost_1_36_0_beta1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-08-11 23:50:38.000000000 +0200 -@@ -16,6 +16,8 @@ - #include - #include - #include -+#include -+ - #if defined(BOOST_SPIRIT_DEBUG) - #include - #endif // defined(BOOST_SPIRIT_DEBUG) -Only in boost_1_36_0_beta1/boost/wave/cpplexer/re2clex: cpp_re2c_lexer.hpp.orig diff --git a/boost-soname.patch b/boost-soname.patch new file mode 100644 index 0000000..52a2e33 --- /dev/null +++ b/boost-soname.patch @@ -0,0 +1,37 @@ +*** tools/build/v2/tools/gcc.jam.orig 2009-05-05 12:45:31.000000000 -0700 +--- tools/build/v2/tools/gcc.jam 2009-05-05 12:48:23.000000000 -0700 +*************** if [ os.name ] != NT && [ os.name ] != O +*** 355,361 **** + # OSF does have an option called -soname but it does not seem to work as + # expected, therefore it has been disabled. + HAVE_SONAME = "" ; +! SONAME_OPTION = -h ; + } + + +--- 355,362 ---- + # OSF does have an option called -soname but it does not seem to work as + # expected, therefore it has been disabled. + HAVE_SONAME = "" ; +! SONAME_OPTION = -soname ; +! SONAME_VERSION = _FEDORA_SONAME ; + } + + +*************** rule link.dll ( targets * : sources * : +*** 793,799 **** + # Differs from 'link' above only by -shared. + actions link.dll bind LIBRARIES + { +! "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) + } + + rule setup-threading ( targets * : sources * : properties * ) +--- 794,800 ---- + # Differs from 'link' above only by -shared. + actions link.dll bind LIBRARIES + { +! "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=).$(SONAME_VERSION) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) + } + + rule setup-threading ( targets * : sources * : properties * ) diff --git a/boost-use-rpm-optflags.patch b/boost-use-rpm-optflags.patch index 5dbb698..8a9ab94 100644 --- a/boost-use-rpm-optflags.patch +++ b/boost-use-rpm-optflags.patch @@ -13,7 +13,7 @@ # Declare flags and action for compilation. toolset.flags gcc.compile OPTIONS off : -O0 ; -! toolset.flags gcc.compile OPTIONS speed : "$RPM_OPT_FLAGS" ; +! toolset.flags gcc.compile OPTIONS speed : "_FEDORA_OPT_FLAGS" ; toolset.flags gcc.compile OPTIONS space : -Os ; toolset.flags gcc.compile OPTIONS off : -fno-inline ; diff --git a/boost-version-override.patch b/boost-version-override.patch new file mode 100644 index 0000000..83453d5 --- /dev/null +++ b/boost-version-override.patch @@ -0,0 +1,36 @@ +*** Jamroot.orig 2009-05-06 12:46:31.000000000 -0700 +--- Jamroot 2009-05-06 18:18:17.000000000 -0700 +*************** rule tag ( name : type ? : property-set +*** 344,350 **** + else + { + local result = [ common.format-name +! + -$(BUILD_ID) + : $(name) : $(type) : $(property-set) ] ; + +--- 344,350 ---- + else + { + local result = [ common.format-name +! + -$(BUILD_ID) + : $(name) : $(type) : $(property-set) ] ; + +*************** rule tag ( name : type ? : property-set +*** 356,362 **** + # suffixes either. Pgi compilers can not accept library with version + # suffix. + if $(type) = SHARED_LIB && +! ( ! ( [ $(property-set).get ] in windows cygwin darwin aix ) && + ! ( [ $(property-set).get ] in pgi ) ) + { + result = $(result).$(BOOST_VERSION) ; +--- 356,362 ---- + # suffixes either. Pgi compilers can not accept library with version + # suffix. + if $(type) = SHARED_LIB && +! ( ! ( [ $(property-set).get ] in windows cygwin darwin aix linux ) && + ! ( [ $(property-set).get ] in pgi ) ) + { + result = $(result).$(BOOST_VERSION) ; diff --git a/boost.spec b/boost.spec index 7066716..4f65cb1 100644 --- a/boost.spec +++ b/boost.spec @@ -1,18 +1,30 @@ -%bcond_with tests -%define sonamever 4 - Name: boost Summary: The Boost C++ Libraries -Version: 1.37.0 -Release: 7%{?dist} +Version: 1.39.0 +Release: 1%{?dist} License: Boost URL: http://www.boost.org/ Group: System Environment/Libraries -Source: boost_1_37_0.tar.bz2 +Source: boost_1_39_0.tar.bz2 Obsoletes: boost-doc <= 1.30.2 Obsoletes: boost-python <= 1.30.2 -Provides: boost-python = %{version}-%{release} Provides: boost-doc = %{version}-%{release} + +# boost is an "umbrella" package that pulls in all other boost components +Requires: boost-date-time = %{version}-%{release} +Requires: boost-filesystem = %{version}-%{release} +Requires: boost-graph = %{version}-%{release} +Requires: boost-iostreams = %{version}-%{release} +Requires: boost-math = %{version}-%{release} +Requires: boost-test = %{version}-%{release} +Requires: boost-program-options = %{version}-%{release} +Requires: boost-python = %{version}-%{release} +Requires: boost-regex = %{version}-%{release} +Requires: boost-serialization = %{version}-%{release} +Requires: boost-signals = %{version}-%{release} +Requires: boost-system = %{version}-%{release} +Requires: boost-wave = %{version}-%{release} + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libstdc++-devel BuildRequires: bzip2-libs @@ -21,15 +33,16 @@ BuildRequires: zlib-devel BuildRequires: python-devel BuildRequires: libicu-devel BuildRequires: chrpath -Patch0: boost-configure.patch +Patch0: boost-version-override.patch Patch1: boost-use-rpm-optflags.patch Patch2: boost-run-tests.patch -Patch3: boost-gcc43.patch -Patch4: boost-gcc-soname.patch -Patch5: boost-function_template.patch -Patch6: boost-unneccessary_iostreams.patch -Patch7: boost-1_37_0-smp.patch -Patch8: boost-bitset.patch +Patch3: boost-soname.patch +Patch4: boost-unneccessary_iostreams.patch +Patch5: boost-bitset.patch + +%bcond_with tests +%bcond_with docs_generated +%define sonamever 5 %description Boost provides free peer-reviewed portable C++ source libraries. The @@ -40,6 +53,127 @@ libraries are suitable for eventual standardization. (Some of the libraries have already been proposed for inclusion in the C++ Standards Committee's upcoming C++ Standard Library Technical Report.) +%package date-time +Summary: Runtime component of boost date-time library +Group: System Environment/Libraries + +%description date-time + +Runtime support for Boost Date Time, set of date-time libraries based +on generic programming concepts. + +%package filesystem +Summary: Runtime component of boost filesystem library +Group: System Environment/Libraries + +%description filesystem + +Runtime support for the Boost Filesystem Library, which provides +portable facilities to query and manipulate paths, files, and +directories. + +%package graph +Summary: Runtime component of boost graph library +Group: System Environment/Libraries + +%description graph + +Runtime support for the BGL graph library. BGL interface and graph +components are generic, in the same sense as the the Standard Template +Library (STL). + +%package iostreams +Summary: Runtime component of boost iostreams library +Group: System Environment/Libraries + +%description iostreams + +Runtime support for Boost.IOStreams, a framework for defining streams, +stream buffers and i/o filters. + +%package math +Summary: Runtime component of boost math library +Group: System Environment/Libraries + +%description math + +Runtime support Boost.Math, a library of math and numeric tools. + +%package test +Summary: Runtime component of boost test library +Group: System Environment/Libraries + +%description test + +Runtime support for simple program testing, full unit testing, and for +program execution monitoring. + +%package program-options +Summary: Runtime component of boost program_options library +Group: System Environment/Libraries + +%description program-options + +Runtime support of boost program options library, which allows program +developers to obtain (name, value) pairs from the user, via +conventional methods such as command line and config file. + +%package python +Summary: Runtime component of boost python library +Group: System Environment/Libraries + +%description python + +The Boost Python Library is a framework for interfacing Python and +C++. It allows you to quickly and seamlessly expose C++ classes +functions and objects to Python, and vice-versa, using no special +tools -- just your C++ compiler. This package contains runtime +support for Boost Python Library. + +%package regex +Summary: Runtime component of boost regular expression library +Group: System Environment/Libraries + +%description regex + +Runtime support for boost regular expression library. + +%package serialization +Summary: Runtime component of boost serialization library +Group: System Environment/Libraries + +%description serialization + +Runtime support for serialization for persistence and marshalling. + +%package signals +Summary: Runtime component of boost signals and slots library +Group: System Environment/Libraries + +%description signals + +Runtime support for managed signals & slots callback implementation. + +%package system +Summary: Runtime component of boost system support library +Group: System Environment/Libraries + +%description system + +Runtime component of Boost operating system support library, including +the diagnostics support that will be part of the C++0x standard +library. + +%package wave +Summary: Runtime component of boost C99/C++ preprocessing library +Group: System Environment/Libraries + +%description wave + +Runtime support for the Boost.Wave library, a Standards conformant, +and highly configurable implementation of the mandated C99/C++ +preprocessor functionality. + %package devel Summary: The Boost C++ headers and shared development libraries Group: Development/Libraries @@ -68,39 +202,41 @@ Provides: boost-python-docs = %{version}-%{release} HTML documentation files for Boost C++ libraries. %prep -%setup -q -n %{name}_1_37_0 +%setup -q -n %{name}_1_39_0 %patch0 -p0 -%patch1 -p0 +sed 's/_FEDORA_OPT_FLAGS/%{optflags}/' %{PATCH1} | %{__patch} -p0 --fuzz=0 %patch2 -p0 -%patch3 -p1 -sed 's/!!!SONAME!!!/%{sonamever}/' %{PATCH4} | %{__patch} -p1 --fuzz=0 +sed 's/_FEDORA_SONAME/%{sonamever}/' %{PATCH3} | %{__patch} -p0 --fuzz=0 +%patch4 -p0 %patch5 -p0 -%patch6 -p0 -sed 's/!!!SMP_FLAGS!!!/%{?_smp_mflags}/' %{PATCH7} | %{__patch} -p1 --fuzz=0 -%patch8 -p1 %build BOOST_ROOT=`pwd` -staged_dir=stage export BOOST_ROOT # build make tools, ie bjam, necessary for building libs, docs, and testing (cd tools/jam/src && ./build.sh) BJAM=`find tools/jam/src/ -name bjam -a -type f` -BUILD_FLAGS="--with-toolset=gcc" +CONFIGURE_FLAGS="--with-toolset=gcc" PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]') PYTHON_FLAGS="--with-python-root=/usr --with-python-version=$PYTHON_VERSION" REGEX_FLAGS="--with-icu" -./configure $BUILD_FLAGS $PYTHON_FLAGS $REGEX_FLAGS -make all +./bootstrap.sh $CONFIGURE_FLAGS $PYTHON_FLAGS $REGEX_FLAGS + +BUILD_VARIANTS="variant=release threading=single,multi debug-symbols=on" +BUILD_FLAGS="-d2 --layout=system $BUILD_VARIANTS" +$BJAM $BUILD_FLAGS %{?_smp_mflags} stage # build docs, requires a network connection for docbook XSLT stylesheets -#cd ./doc -#chmod +x ../tools/boostbook/setup_boostbook.sh -#../tools/boostbook/setup_boostbook.sh -#$BOOST_ROOT/$BJAM --v2 -sICU_PATH=/usr --user-config=../user-config.jam html -#cd .. +%if %{with docs_generated} +cd ./doc +chmod +x ../tools/boostbook/setup_boostbook.sh +../tools/boostbook/setup_boostbook.sh +USER_CFG=$BOOST_ROOT/tools/build/v2/user-config.jam +$BOOST_ROOT/$BJAM --v2 -sICU_PATH=/usr --user-config=$USER_CFG html +cd .. +%endif %check %if %{with tests} @@ -109,8 +245,11 @@ echo "" >> status/regression_comment.html echo "

" `g++ --version` "

" >> status/regression_comment.html echo "" >> status/regression_comment.html -chmod +x tools/regression/run_tests.sh -./tools/regression/run_tests.sh +cd tools/regression/build +#$BOOST_ROOT/$BJAM +cd ../test +#python ./test.py +cd ../../.. results1=status/cs-`uname`.html results2=status/cs-`uname`-links.html @@ -196,6 +335,79 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so.%{version} %{_libdir}/*.so.%{sonamever} +%files date-time +%defattr(-, root, root, -) +%{_libdir}/libboost_date_time*.so.%{version} +%{_libdir}/libboost_date_time*.so.%{sonamever} + +%files filesystem +%defattr(-, root, root, -) +%{_libdir}/libboost_filesystem*.so.%{version} +%{_libdir}/libboost_filesystem*.so.%{sonamever} + +%files graph +%defattr(-, root, root, -) +%{_libdir}/libboost_graph*.so.%{version} +%{_libdir}/libboost_graph*.so.%{sonamever} + +%files iostreams +%defattr(-, root, root, -) +%{_libdir}/libboost_iostreams*.so.%{version} +%{_libdir}/libboost_iostreams*.so.%{sonamever} + +%files math +%defattr(-, root, root, -) +%{_libdir}/libboost_math*.so.%{version} +%{_libdir}/libboost_math*.so.%{sonamever} + +%files test +%defattr(-, root, root, -) +%{_libdir}/libboost_prg_exec_monitor*.so.%{version} +%{_libdir}/libboost_prg_exec_monitor*.so.%{sonamever} +%{_libdir}/libboost_unit_test_framework*.so.%{version} +%{_libdir}/libboost_unit_test_framework*.so.%{sonamever} + +%files program-options +%defattr(-, root, root, -) +%{_libdir}/libboost_program_options*.so.%{version} +%{_libdir}/libboost_program_options*.so.%{sonamever} + +%files python +%defattr(-, root, root, -) +%{_libdir}/libboost_python*.so.%{version} +%{_libdir}/libboost_python*.so.%{sonamever} + +%files regex +%defattr(-, root, root, -) +%{_libdir}/libboost_regex*.so.%{version} +%{_libdir}/libboost_regex*.so.%{sonamever} + +%files serialization +%defattr(-, root, root, -) +%{_libdir}/libboost_serialization*.so.%{version} +%{_libdir}/libboost_serialization*.so.%{sonamever} +%{_libdir}/libboost_wserialization*.so.%{version} +%{_libdir}/libboost_wserialization*.so.%{sonamever} + +%files signals +%defattr(-, root, root, -) +%{_libdir}/libboost_signals*.so.%{version} +%{_libdir}/libboost_signals*.so.%{sonamever} + +%files system +%defattr(-, root, root, -) +%{_libdir}/libboost_system*.so.%{version} +%{_libdir}/libboost_system*.so.%{sonamever} + +%files wave +%defattr(-, root, root, -) +%{_libdir}/libboost_wave*.so.%{version} +%{_libdir}/libboost_wave*.so.%{sonamever} + +%files doc +%defattr(-, root, root, -) +%doc %{_docdir}/%{name}-%{version} + %files devel %defattr(-, root, root, -) %{_includedir}/boost @@ -205,11 +417,22 @@ rm -rf $RPM_BUILD_ROOT %defattr(-, root, root, -) %{_libdir}/*.a -%files doc -%defattr(-, root, root, -) -%doc %{_docdir}/%{name}-%{version} - %changelog +* Thu May 07 2009 Benjamin Kosnik - 1.39.0-1 +- Update release. + +* Wed May 06 2009 Benjamin Kosnik - 1.39.0-0.3 +- Fixes for rpmlint. + +* Wed May 06 2009 Petr Machata - 1.39.0-0.2 +- Split up boost package to sub-packages per library +- Resolves: #496188 + +* Wed May 06 2009 Benjamin Kosnik - 1.39.0-0.1 +- Rebase to 1.39.0. +- Add --with docs_generated. +- #225622: Substitute optflags at prep time instead of RPM_OPT_FLAGS. + * Mon May 04 2009 Benjamin Kosnik - 1.37.0-7 - Rebuild for libicu bump. diff --git a/import.log b/import.log index 8ea7cec..3b6338d 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ boost-1_37_0-1_fc10:HEAD:boost-1.37.0-1.fc10.src.rpm:1229535558 +boost-1_39_0-1_fc10:HEAD:boost-1.39.0-1.fc10.src.rpm:1241744899 diff --git a/sources b/sources index ce35129..2bcf3a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8d9f990bfb7e83769fa5f1d6f065bc92 boost_1_37_0.tar.bz2 +a17281fd88c48e0d866e1a12deecbcc0 boost_1_39_0.tar.bz2