From d3f343ea0d5e5d05b0f34daad4e3b31c580dfed1 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 03:41:46 +0000 Subject: [PATCH 1/4] Initialize branch F-10 for boost --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 75bd1c04febabe88f510668442c8744138543411 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 5 Jan 2009 15:20:19 +0000 Subject: [PATCH 2/4] - Fix missing include in relaxed_heap.hpp - Related: #475587 --- boost-gcc43.patch | 11 +++++++++++ boost.spec | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/boost-gcc43.patch b/boost-gcc43.patch index af64bd0..6898adb 100644 --- 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(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 + #include + #include ++#include + + #ifdef BOOST_RELAXED_HEAP_DEBUG + # include diff --git a/boost.spec b/boost.spec index ac767ca..e5f1476 100644 --- 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 - 1.34.1-18 +- Fix missing include in relaxed_heap.hpp +- Related: #475587 + * Mon Oct 6 2008 Petr Machata - 1.34.1-17 - Fix gcc43 patch to apply cleanly under --fuzz=0 - Resolves: #465003 From 5d0080803ed13087f046110fb22b61a94d5b5018 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:22:50 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8ebb4c7..a239116 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: boost -# $Id: Makefile,v 1.3 2005/08/19 17:39:58 bkoz Exp $ +# $Id: Makefile,v 1.4 2007/10/15 17:13:04 scop 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From b80bc413f87e054f3455d0183db2e5308d803b1f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:12:09 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a239116..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: boost -# $Id: Makefile,v 1.4 2007/10/15 17:13:04 scop 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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10