Remove RHEL/CentOS 5 specific workarounds
This commit is contained in:
parent
13ed0b5835
commit
fed7bff3dd
File diff suppressed because it is too large
Load Diff
@ -8,8 +8,7 @@ URL: http://fallabs.com/%{name}/
|
||||
Source: http://fallabs.com/%{name}/pkg/%{name}-%{version}.tar.gz
|
||||
Patch0: kyotocabinet-1.2.76-cflags.patch
|
||||
Patch1: kyotocabinet-1.2.76-8-byte-atomics.patch
|
||||
Patch2: kyotocabinet-1.2.76-tr1_hashtable.patch
|
||||
Patch3: kyotocabinet-1.2.76-gcc6.patch
|
||||
Patch2: kyotocabinet-1.2.76-gcc6.patch
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
BuildRequires: gcc-c++, zlib-devel, lzo-devel, xz-devel
|
||||
|
||||
@ -45,9 +44,7 @@ developing applications that use Kyoto Cabinet.
|
||||
%package apidocs
|
||||
Summary: API documentation for Kyoto Cabinet library
|
||||
Group: Documentation
|
||||
%if 0%{?fedora}%{?rhel} >= 6
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
Provides: %{name}-api-doc = %{version}-%{release}
|
||||
Obsoletes: %{name}-api-doc < 1.2.76-3
|
||||
|
||||
@ -59,10 +56,7 @@ applications that use Kyoto Cabinet.
|
||||
%setup -q
|
||||
%patch0 -p1 -b .cflags
|
||||
%patch1 -p1 -b .8-byte-atomics
|
||||
%if 0%{?rhel} == 5
|
||||
%patch2 -p1 -b .tr1_hashtable
|
||||
%endif
|
||||
%patch3 -p1 -b .gcc6
|
||||
%patch2 -p1 -b .gcc6
|
||||
|
||||
%build
|
||||
%configure --disable-opt --enable-lzo --enable-lzma
|
||||
@ -78,12 +72,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libkyotocabinet.a
|
||||
rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}
|
||||
|
||||
%check
|
||||
# All kcutilmgr compression tests on RHEL 5 (ppc) just cause 99.9% CPU
|
||||
# usage but do not continue or simply fail. However all the other tests
|
||||
# including compression ones work as expected. What is the impact here?
|
||||
%if 0%{?rhel} == 5 && "%{_arch}" == "ppc"
|
||||
sed -e '/$(RUNENV) $(RUNCMD) .\/kcutilmgr comp /d' -i Makefile
|
||||
%endif
|
||||
make check
|
||||
|
||||
%post libs -p /sbin/ldconfig
|
||||
@ -142,9 +130,6 @@ make check
|
||||
%{_includedir}/kcdbext.h
|
||||
%{_includedir}/kcdirdb.h
|
||||
%{_includedir}/kcfile.h
|
||||
%if 0%{?rhel} == 5
|
||||
%{_includedir}/kcfunctional.h
|
||||
%endif
|
||||
%{_includedir}/kchashdb.h
|
||||
%{_includedir}/kclangc.h
|
||||
%{_includedir}/kcmap.h
|
||||
|
Loading…
Reference in New Issue
Block a user