7.6.4, reverts abi bump, compat-gc no longer needed

This commit is contained in:
Rex Dieter 2018-02-20 13:22:13 -06:00
parent c784568f3e
commit 6de65dd864
3 changed files with 8 additions and 55 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/gc-7.6.0.tar.gz
/gc-7.6.2.tar.gz
/gc-7.6.4.tar.gz

59
gc.spec
View File

@ -1,17 +1,12 @@
%global compat 1
Summary: A garbage collector for C and C++
Name: gc
Version: 7.6.2
Release: 4%{?dist}
Version: 7.6.4
Release: 1%{?dist}
License: BSD
Url: http://www.hboehm.info/gc/
Source0: http://www.hboehm.info/gc/gc_source/gc-%{version}%{?pre}.tar.gz
%if 0%{?compat}
Source1: http://www.hboehm.info/gc/gc_source/gc-7.6.0.tar.gz
%endif
## upstreamable patches
@ -38,11 +33,6 @@ Provides: libgc-devel = %{version}-%{release}
%description devel
%{summary}.
%package -n compat-gc
Summary: Compat gc-7.6.0 runtime library
%description -n compat-gc
%{summary} to ease transition to gc-7.6.2+.
%prep
%autosetup -n gc-%{version}%{?pre}
@ -51,17 +41,8 @@ Summary: Compat gc-7.6.0 runtime library
rm -f libtool libtool.m4
autoreconf -i -f
%if 0%{?compat}
tar xzf %{SOURCE1}
pushd gc-7.6.0
rm -f libtool libtool.m4
autoreconf -i -f
popd
%endif
%build
# see bugzilla.redhat.com/689877
CPPFLAGS="-DUSE_GET_STACKBASE_FOR_MAIN"; export CPPFLAGS
@ -77,32 +58,8 @@ CPPFLAGS="-DUSE_GET_STACKBASE_FOR_MAIN"; export CPPFLAGS
%{make_build}
%if 0%{?compat}
pushd gc-7.6.0
%configure \
--disable-static \
--enable-cplusplus \
--enable-large-config \
%ifarch %{ix86}
--enable-parallel-mark \
%endif
--enable-threads=posix
%{make_build}
popd
%endif
%install
%if 0%{?compat}
%{make_install} -C gc-7.6.0
rm -rfv %{buildroot}{%{_includedir},%{_datadir}}
rm -fv %{buildroot}%{_libdir}/lib{cord,gcccpp}*
rm -fv %{buildroot}%{_libdir}/libgc.so
%endif
%{make_install}
install -p -D -m644 doc/gc.man %{buildroot}%{_mandir}/man3/gc.3
@ -128,7 +85,7 @@ make check %{?arch_ignore}
%files
%{_libdir}/libcord.so.1*
%{_libdir}/libgc.so.2*
%{_libdir}/libgc.so.1*
%{_libdir}/libgccpp.so.1*
%files devel
@ -143,15 +100,11 @@ make check %{?arch_ignore}
%{_libdir}/pkgconfig/bdw-gc.pc
%{_mandir}/man3/gc.3*
%if 0%{?compat}
%ldconfig_scriptlets -n compat-gc
%files -n compat-gc
%{_libdir}/libgc.so.1*
%endif
%changelog
* Tue Feb 20 2018 Rex Dieter <rdieter@fedoraproject.org> - 7.6.4-1
- 7.6.4, reverts abi bump, compat-gc no longer needed
* Tue Feb 20 2018 Rex Dieter <rdieter@fedoraproject.org> - 7.6.2-4
- BR: gcc-c++
- add (temporary) compat-gc

View File

@ -1,2 +1 @@
SHA512 (gc-7.6.2.tar.gz) = 7b54812903929b0d5d1d696beac54629a7667997b41ef45299373bc18b2153d5755286b25e11cc90ffc572239e52a02900927bc60b0ad3593162b8c8e259fd50
SHA512 (gc-7.6.0.tar.gz) = 511e8c01287b1ee9dbec87f0573377de77038b7af053a3f33afed9b3ffa30e2402d6a9bb0ca4f4b81cd808209b47b5718d498cff3de6632a057fe03fad51fc43
SHA512 (gc-7.6.4.tar.gz) = 2c85be3e24b85732b3dc6f08fe98cf1a82b6fb2a22ec73090f80920721c737ef92cee8f0cd7ea7228d686005d164e7da54ce3907c3a1ba5eefa43355a472085e