Compare commits

...

5 Commits
master ... f9

Author SHA1 Message Date
Fedora Release Engineering
865f1489c5 dist-git conversion 2010-07-28 11:12:17 +00:00
Bill Nottingham
1a1a0c7cb1 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:22:52 +00:00
Petr Machata
ce3dbabfdc - Fix missing <limits.h> include in relaxed_heap.hpp
- Resolves: #475587
2009-01-05 15:15:24 +00:00
Petr Machata
4e9fe29798 - Fix "changes meaning of keywords" in boost date_time
- Resolves: #450718
2008-06-12 11:09:13 +00:00
Jesse Keating
a7589e3b57 Initialize branch F-9 for boost 2008-04-20 13:51:28 +00:00
4 changed files with 59 additions and 22 deletions

View File

View File

@ -1,21 +0,0 @@
# Makefile for source rpm: boost
# $Id: Makefile,v 1.3 2005/08/19 17:39:58 bkoz Exp $
NAME := boost
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attempt a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

View File

@ -174,3 +174,53 @@ diff -urp boost_1_34_1/boost/python/detail/def_helper.hpp boost_1_34_1-pm/boost/
, char const*
, void(not_specified::*)() // A function pointer type which is never an
// appropriate default implementation
diff -urp new-boost/date_time/tz_db_base.hpp old-boost/date_time/tz_db_base.hpp
--- boost_1_34_1/boost/date_time/tz_db_base.hpp 2008-06-12 13:03:34.000000000 +0200
+++ boost_1_34_1-pm/boost/date_time/tz_db_base.hpp 2008-06-12 12:59:43.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<char_type> time_zone_names;
- typedef dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
+ typedef dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets_t;
typedef std::basic_string<char_type> string_type;
//! Constructs an empty database
@@ -346,18 +346,18 @@ namespace boost {
time_duration_type utc_offset =
str_from_delimited_time_duration<time_duration_type,char_type>(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<rule_type> rules;
if(has_dst){
- adjust = dst_adjustment_offsets(
- str_from_delimited_time_duration<time_duration_type,char_type>(result[DSTADJUST]),
- str_from_delimited_time_duration<time_duration_type,char_type>(result[START_TIME]),
- str_from_delimited_time_duration<time_duration_type,char_type>(result[END_TIME])
- );
+ adjust = dst_adjustment_offsets_t(
+ str_from_delimited_time_duration<time_duration_type,char_type>(result[DSTADJUST]),
+ str_from_delimited_time_duration<time_duration_type,char_type>(result[START_TIME]),
+ str_from_delimited_time_duration<time_duration_type,char_type>(result[END_TIME])
+ );
rules =
boost::shared_ptr<rule_type>(parse_rules(result[START_DATE_RULE],
diff -urp boost/pending/relaxed_heap.hpp /usr/include/boost/pending/relaxed_heap.hpp
--- boost_1_34_1/boost/pending/relaxed_heap.hpp 2005-12-08 03:56:25.000000000 +0100
+++ boost_1_34_1-pm/boost/pending/relaxed_heap.hpp 2009-01-05 13:49:23.000000000 +0100
@@ -13,6 +13,7 @@
#include <boost/property_map.hpp>
#include <boost/optional.hpp>
#include <vector>
+#include <limits.h>
#ifdef BOOST_RELAXED_HEAP_DEBUG
# include <iostream>

View File

@ -3,7 +3,7 @@
Name: boost
Summary: The Boost C++ Libraries
Version: 1.34.1
Release: 14%{?dist}
Release: 16%{?dist}
License: Boost Software License (GPL-Compatible, Free Software License)
URL: http://www.boost.org/
Group: System Environment/Libraries
@ -198,6 +198,14 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_docdir}/%{name}-%{version}
%changelog
* Mon Jan 5 2009 Petr Machata <pmachata@redhat.com> - 1.34.1-16
- Fix missing <limits.h> include in relaxed_heap.hpp
- Resolves: #475587
* Thu Jun 12 2008 Petr Machata <pmachata@redhat.com> - 1.34.1-15
- Fix "changes meaning of keywords" in boost date_time
- Resolves: #450718
* Thu Mar 27 2008 Petr Machata <pmachata@redhat.com> - 1.34.1-14
- Change devel-static back to static.
- Related: #225622