diff --git a/gc-7.1-dup_cpp_headers.patch b/gc-7.1-dup_cpp_headers.patch new file mode 100644 index 0000000..a9d6ea0 --- /dev/null +++ b/gc-7.1-dup_cpp_headers.patch @@ -0,0 +1,14 @@ +diff -up gc-7.1/include/include.am.dup_headers gc-7.1/include/include.am +--- gc-7.1/include/include.am.dup_headers 2007-12-21 18:20:15.000000000 -0600 ++++ gc-7.1/include/include.am 2009-07-18 20:34:58.812906860 -0500 +@@ -21,10 +21,8 @@ pkginclude_HEADERS += \ + include/gc_typed.h \ + include/gc_inline.h \ + include/gc_mark.h \ +- include/gc_cpp.h \ + include/weakpointer.h \ + include/new_gc_alloc.h \ +- include/gc_allocator.h \ + include/gc_backptr.h \ + include/gc_gcj.h \ + include/leak_detector.h \ diff --git a/gc.spec b/gc.spec index f46ccf6..e3244e5 100644 --- a/gc.spec +++ b/gc.spec @@ -3,7 +3,7 @@ Summary: A garbage collector for C and C++ Name: gc Version: 7.1 -Release: 7%{?dist} +Release: 8%{?dist} Group: System Environment/Libraries License: BSD Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ @@ -13,6 +13,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # To be more backward-compatible abi-wise, TODO: upstream ml reference Patch1: gc-7.1-gcinit.patch Patch3: gc-7.1-sparc.patch + +## upstreamable patches +Patch50: gc-7.1-dup_cpp_headers.patch + ## upstream patches # http://www.hpl.hp.com/hosted/linux/mail-archives/gc/2008-May/002206.html Patch100: gc-7.1-dont_add_byte.patch @@ -49,6 +53,8 @@ Provides: libgc-devel = %{version}-%{release} %endif %patch3 -p1 -b .sparc +%patch50 -p1 -b .dup_cpp_headers + %patch100 -p1 -b .dont_add_byte # refresh auto*/libtool to purge rpaths @@ -115,6 +121,9 @@ rm -rf %{buildroot} %changelog +* Sat Jul 16 2009 Rex Dieter - 7.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild