From 708819aa30b8445f5c43b641706244a3837220f5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 8 Aug 2005 15:42:01 +0000 Subject: [PATCH] - 6.5 --- .cvsignore | 2 +- gc.spec | 44 +++++++-------- gc6.4-opendl.patch => gc6.5-opendl.patch | 68 ++++++++++++------------ sources | 2 +- 4 files changed, 58 insertions(+), 58 deletions(-) rename gc6.4-opendl.patch => gc6.5-opendl.patch (79%) diff --git a/.cvsignore b/.cvsignore index 53c875a..ee41801 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gc6.4.tar.gz +gc6.5.tar.gz diff --git a/gc.spec b/gc.spec index a523313..e058afb 100644 --- a/gc.spec +++ b/gc.spec @@ -1,32 +1,29 @@ -# $Id: gc.spec,v 1.8 2005/04/06 22:11:37 mschwendt Exp $ +# $Id: gc.spec,v 1.9 2005/08/08 15:42:01 rdieter Exp $ -Summary: C++ Garbage Collector -Name: gc -Version: 6.4 -# For Extras -Release: 3 +Summary: C++ Garbage Collector +Name: gc +Version: 6.5 -# For kde-redhat -#Release: 0.2%{?dist_tag}.kde +Release: 1%{?dist} Group: System Environment/Libraries License: BSD -Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ -Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.4.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ +Source: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: gc6.4-opendl.patch +Patch1: gc6.5-opendl.patch %description -The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage +The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage collecting replacement for C malloc or C++ new. %package devel -Summary: Libraries and header files for gc development +Summary: Libraries and header files for %{name} development Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel -Libraries and header files for gc development. +Libraries and header files for %{name} development. %prep @@ -55,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -install -p -D -m644 doc/gc.man $RPM_BUILD_ROOT%{_mandir}/man3/gc.3 +install -p -D -m644 doc/gc.man $RPM_BUILD_ROOT%{_mandir}/man3/gc.3 ## Unpackaged files rm -rf $RPM_BUILD_ROOT%{_datadir}/gc @@ -63,14 +60,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %clean -rm -rf "$RPM_BUILD_ROOT" +rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig -%files +%files %defattr(-,root,root) %doc doc/README doc/README.changes doc/README.contributors %{_libdir}/lib*.so.* @@ -80,11 +78,13 @@ rm -rf "$RPM_BUILD_ROOT" %doc doc/*.html %{_includedir}/* %{_libdir}/lib*.so -#{_libdir}/lib*.*a %{_mandir}/man?/* %changelog +* Wed May 25 2005 Rex Dieter 6.5-1 +- 6.5 + * Fri Apr 7 2005 Michael Schwendt - rebuilt @@ -117,16 +117,16 @@ rm -rf "$RPM_BUILD_ROOT" - OK, put manpage in man3. * Thu Oct 02 2003 Rex Dieter 0:6.2-0.fdr.2 -- drop manpage pending feedback from developer. +- drop manpage pending feedback from developer. * Tue Sep 30 2003 Rex Dieter 0:6.2-0.fdr.1 -- fix manpage location +- fix manpage location - remove .la file (it appears unnecessary after all, thanks to opendl patch) - remove cvs tag from description - touchup -devel desc/summary. - macro update to support Fedora Core -* Thu Sep 11 2003 Rex Dieter 0:6.2-0.fdr.0 +* Thu Sep 11 2003 Rex Dieter 0:6.2-0.fdr.0 - 6.2 release. - update license (BSD) - Consider building with: --enable-parallel-mark diff --git a/gc6.4-opendl.patch b/gc6.5-opendl.patch similarity index 79% rename from gc6.4-opendl.patch rename to gc6.5-opendl.patch index 098e04b..801e384 100644 --- a/gc6.4-opendl.patch +++ b/gc6.5-opendl.patch @@ -1,5 +1,37 @@ ---- gc6.4/Makefile.am.opendl 2004-12-16 18:27:52.000000000 -0600 -+++ gc6.4/Makefile.am 2005-01-10 09:58:12.000000000 -0600 +--- gc6.5/Makefile.in.opendl 2005-05-16 18:28:28.000000000 -0500 ++++ gc6.5/Makefile.in 2005-05-25 10:27:00.341398988 -0500 +@@ -336,7 +336,7 @@ + + # Include THREADDLLIBS here to ensure that the correct versions of + # linuxthread semaphore functions get linked: +-libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) ++libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) + libgc_la_DEPENDENCIES = @addobjs@ + libgc_la_LDFLAGS = -version-info 1:2:0 + EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \ +@@ -345,7 +345,7 @@ + sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s + + libgccpp_la_SOURCES = gc_cpp.cc +-libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) ++libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) + libgccpp_la_LDFLAGS = -version-info 1:2:0 + AM_CXXFLAGS = @GC_CFLAGS@ + AM_CFLAGS = @GC_CFLAGS@ +@@ -354,9 +354,9 @@ + + # gctest_OBJECTS = test.o + gctest_SOURCES = tests/test.c +-gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) ++gctest_LDADD = ./libgc.la + test_cpp_SOURCES = tests/test_cpp.cc +-test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) ++test_cpp_LDADD = ./libgc.la ./libgccpp.la + TESTS = gctest $(extra_checks) + all_objs = @addobjs@ $(libgc_la_OBJECTS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \ +--- gc6.5/Makefile.am.opendl 2005-05-16 17:11:08.000000000 -0500 ++++ gc6.5/Makefile.am 2005-05-25 10:25:35.953868785 -0500 @@ -55,7 +55,7 @@ # Include THREADDLLIBS here to ensure that the correct versions of @@ -30,35 +62,3 @@ TESTS = gctest $(extra_checks) ---- gc6.4/Makefile.in.opendl 2004-12-20 20:00:44.000000000 -0600 -+++ gc6.4/Makefile.in 2005-01-10 09:59:11.000000000 -0600 -@@ -188,7 +188,7 @@ - - # Include THREADDLLIBS here to ensure that the correct versions of - # linuxthread semaphore functions get linked: --libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) -+libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) - libgc_la_DEPENDENCIES = @addobjs@ - libgc_la_LDFLAGS = -version-info 1:2:0 - -@@ -199,7 +199,7 @@ - - - libgccpp_la_SOURCES = gc_cpp.cc --libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) -+libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) - libgccpp_la_LDFLAGS = -version-info 1:2:0 - - AM_CXXFLAGS = @GC_CFLAGS@ -@@ -212,9 +212,9 @@ - - # gctest_OBJECTS = test.o - gctest_SOURCES = tests/test.c --gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) -+gctest_LDADD = ./libgc.la - test_cpp_SOURCES = tests/test_cpp.cc --test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) -+test_cpp_LDADD = ./libgc.la ./libgccpp.la - - TESTS = gctest $(extra_checks) - diff --git a/sources b/sources index 69004d3..31000a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef03495e980b834a99c0e27eedaa546e gc6.4.tar.gz +00bf95cdcbedfa7321d14e0133b31cdb gc6.5.tar.gz