* build/rpm/apr.spec.in: Move installbuilddir to

%{_libdir}/apr/build-1, remove unnecessary TZ setting for testall and
old x86_64 pthreads workaround.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65256 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 13 deletions

diff --git a/build/rpm/apr.spec.in b/build/rpm/apr.spec.in
index 050cf31bd..7d113c35a 100644
--- a/build/rpm/apr.spec.in
+++ b/build/rpm/apr.spec.in
@@ -11,7 +11,6 @@ URL: http://apr.apache.org/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildPrereq: autoconf, libtool, doxygen
-Conflicts: subversion < 0.20.1-2
 
 %description
 The mission of the Apache Portable Runtime (APR) is to provide a
@@ -23,7 +22,6 @@ including Unices, MS Win32, BeOS and OS/2.
 Group: Development/Libraries
 Summary: APR library development kit
 Requires: apr = %{version}
-Conflicts: subversion-devel < 0.20.1-2
 
 %description devel
 This package provides the support files which can be used to 
@@ -40,20 +38,16 @@ C data structures and routines.
 %configure \
         --prefix=/usr \
         --includedir=%{_includedir}/apr-%{aprver} \
-        --with-installbuilddir=%{_libdir}/apr/build \
+        --with-installbuilddir=%{_libdir}/apr/build-%{aprver} \
         --with-devrandom=/dev/urandom \
         CC=gcc CXX=g++
 make %{?_smp_mflags} && make dox
 
 %check
 # Run non-interactive tests
-%ifarch x86_64
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=97611
-excludes=testlock
-%endif
 pushd test
 make %{?_smp_mflags} testall CFLAGS=-fno-strict-aliasing
-TZ=PST8PDT ./testall -v ${excludes+-x $excludes} || exit 1
+./testall -v || exit 1
 popd
 
 %install
@@ -75,7 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES LICENSE 
+%doc CHANGES LICENSE NOTICE
 %{_libdir}/libapr-%{aprver}.so.*
 
 %files devel
@@ -83,13 +77,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/APRDesign.html docs/canonical_filenames.html
 %doc docs/incomplete_types docs/non_apr_programs
 %doc --parents html
-%{_bindir}/apr-config
-%{_bindir}/apr-%{aprver}-config
+%{_bindir}/apr*config
 %{_libdir}/libapr-%{aprver}.*a
 %{_libdir}/libapr-%{aprver}.so
 %dir %{_libdir}/apr
-%dir %{_libdir}/apr/build
-%{_libdir}/apr/build/*
+%dir %{_libdir}/apr/build-%{aprver}
+%{_libdir}/apr/build-%{aprver}/*
 %{_libdir}/pkgconfig/apr-%{aprver}.pc
 %dir %{_includedir}/apr-%{aprver}
 %{_includedir}/apr-%{aprver}/*.h