dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-28 11:12:09 +00:00 · 2009-11-26 01:22:50 +00:00 · 2009-01-05 15:20:19 +00:00 · 2008-11-07 03:41:46 +00:00
4 changed files with 16 additions and 22 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/21
+++ b/21
@ -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)
--- a/boost-gcc43.patch
+++ b/boost-gcc43.patch
@ -213,3 +213,14 @@ diff -urp new-boost/date_time/tz_db_base.hpp old-boost/date_time/tz_db_base.hpp
 
           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>
--- a/boost.spec
+++ b/boost.spec
@ -3,7 +3,7 @@
 Name: boost
 Summary: The Boost C++ Libraries
 Version: 1.34.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: Boost
 URL: http://www.boost.org/
 Group: System Environment/Libraries
@ -198,6 +198,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/%{name}-%{version}

 %changelog
+* Mon Jan  5 2009 Petr Machata <pmachata@redhat.com> - 1.34.1-18
+- Fix missing <limits.h> include in relaxed_heap.hpp
+- Related: #475587
+
 * Mon Oct  6 2008 Petr Machata <pmachata@redhat.com> - 1.34.1-17
 - Fix gcc43 patch to apply cleanly under --fuzz=0
 - Resolves: #465003
Author	SHA1	Message	Date
Fedora Release Engineering	b80bc413f8	dist-git conversion	2010-07-28 11:12:09 +00:00
Bill Nottingham	5d0080803e	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:22:50 +00:00
Petr Machata	75bd1c04fe	- Fix missing <limits.h> include in relaxed_heap.hpp - Related: #475587	2009-01-05 15:20:19 +00:00
Jesse Keating	d3f343ea0d	Initialize branch F-10 for boost	2008-11-07 03:41:46 +00:00