diff --git a/.cvsignore b/.cvsignore index a74dc55..aa28e5e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ +gc-7.1.tar.gz libatomic_ops-1.2.tar.gz diff --git a/libatomic_ops.spec b/libatomic_ops.spec index 8423c3d..5b3abb0 100644 --- a/libatomic_ops.spec +++ b/libatomic_ops.spec @@ -1,17 +1,23 @@ +%define gc_version 7.1 + Name: libatomic_ops Version: 1.2 -Release: 7%{?dist} +Release: 8.gc%{?dist} Summary: Atomic memory update operations Group: Development/Libraries License: GPLv2+ and MIT URL: http://www.hpl.hp.com/research/linux/atomic_ops/ -Source0: http://www.hpl.hp.com/research/linux/atomic_ops/download/%{name}-%{version}.tar.gz +%if 0%{?gc_version:1} +Source0: http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-%{gc_version}.tar.gz +%else +Source0: http://www.hpl.hp.com/research/linux/atomic_ops/download/%{name}-%{version}.tar.gz +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: libatomic_ops-1.2-ppclwzfix.patch -Patch2: libatomic_ops-1.2-s390-include.patch +Patch1: libatomic_ops-1.2-ppclwzfix.patch +Patch2: libatomic_ops-1.2-s390-include.patch # No debug information gets generated from a static lib, so # debuginfo will be empty. @@ -26,10 +32,9 @@ that involves minimum overhead across a variety of architectures. %package devel -Summary: Atomic memory update operations -Group: Development/Libraries +Summary: Atomic memory update operations +Group: Development/Libraries Provides: %{name}-static = %{version}-%{release} - %description devel Provides implementations for atomic memory update operations on a number of architectures. This allows direct use of these in reasonably @@ -39,13 +44,17 @@ that involves minimum overhead across a variety of architectures. %prep -%setup -q +%setup -q -n gc-%{gc_version}/libatomic_ops-%{version} +%if ! 0%{?gc_version:1} +# already fixed in gc version %patch1 -p1 +%endif %patch2 -p1 -chmod a-x src/*.h + %build %configure + make %{?_smp_mflags} @@ -74,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 24 2009 Rex Dieter - 1.2-8.gc +- use gc tarball, tag gc release + * Thu Jul 23 2009 Rex Dieter - 1.2-7 - devel: Provides: %%name-static ... - consolidate %%doc's diff --git a/sources b/sources index 6e77636..bd6e6f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b65e48271c81e3fa2d7a9a69bab7504 libatomic_ops-1.2.tar.gz +2ff9924c7249ef7f736ecfe6f08f3f9b gc-7.1.tar.gz