- disable sqlite2 support

- BuildRequire e2fsprogs-devel
- enable malloc paranoia in %check
This commit is contained in:
jorton 2006-01-18 11:49:39 +00:00
parent d226cbef90
commit f11e4fc77e

View File

@ -4,7 +4,7 @@
Summary: Apache Portable Runtime Utility library Summary: Apache Portable Runtime Utility library
Name: apr-util Name: apr-util
Version: 1.2.2 Version: 1.2.2
Release: 2.2 Release: 3
License: Apache Software License 2.0 License: Apache Software License 2.0
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://apr.apache.org/ URL: http://apr.apache.org/
@ -13,7 +13,8 @@ Patch0: apr-util-1.2.2-exports.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: autoconf, doxygen, apr-devel >= 1.2.0 BuildRequires: autoconf, doxygen, apr-devel >= 1.2.0
BuildRequires: openldap-devel, db4-devel, expat-devel BuildRequires: openldap-devel, db4-devel, expat-devel
BuildRequires: postgresql-devel, sqlite-devel BuildRequires: postgresql-devel, sqlite-devel >= 3.0.0
BuildRequires: e2fsprogs-devel
Conflicts: subversion < 0.20.1-2 Conflicts: subversion < 0.20.1-2
%description %description
@ -44,7 +45,8 @@ autoheader && autoconf
%configure --with-apr=%{_prefix} \ %configure --with-apr=%{_prefix} \
--includedir=%{_includedir}/apr-%{apuver} \ --includedir=%{_includedir}/apr-%{apuver} \
--with-ldap --without-gdbm \ --with-ldap --without-gdbm \
--with-sqlite3 --with-pgsql --with-sqlite3 --with-pgsql \
--without-sqlite2
make %{?_smp_mflags} && make dox make %{?_smp_mflags} && make dox
%install %install
@ -69,6 +71,7 @@ sed -ri '/^dependency_libs/{s,-l(pq|sqlite[0-9]|rt|dl|uuid) ,,g}' \
%check %check
# Run the less verbose test suites # Run the less verbose test suites
export MALLOC_CHECK_=2 MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
cd test cd test
make %{?_smp_mflags} testall testrmm testdbm make %{?_smp_mflags} testall testrmm testdbm
./testall -v -q ./testall -v -q
@ -98,6 +101,11 @@ rm -rf $RPM_BUILD_ROOT
%doc --parents html %doc --parents html
%changelog %changelog
* Wed Jan 18 2006 Joe Orton <jorton@redhat.com> 1.2.2-3
- disable sqlite2 support
- BuildRequire e2fsprogs-devel
- enable malloc paranoia in %%check
* Tue Jan 3 2006 Jesse Keating <jkeating@redhat.com> 1.2.2-2.2 * Tue Jan 3 2006 Jesse Keating <jkeating@redhat.com> 1.2.2-2.2
- rebuilt again - rebuilt again