apr-util-1.6.1-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11917 ec354946-7b23-47d6-9f5a-488ba84defc7

a/apr-util/apr-util-vl.spec

@@ -3,23 +3,26 @@
 Summary: Apache Portable Runtime Utility library
 Summary(ja): Apache ポータブルランタイムユーティリティライブラリ
 Name: apr-util
-Version: 1.5.4
+Version: 1.6.1
 Release: 1%{?_dist_release}
 
 License: Apache Software License 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 Source0: %{name}-%{version}.tar.bz2
 Patch1: apr-util-1.2.7-pkgconf.patch
-Patch2: apr-util-1.3.7-nodbmdso.patch
 Patch4: apr-util-1.4.1-private.patch
+Patch5: apr-util-mariadb-upstream.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf, doxygen, apr-devel >= 1.2.0
 BuildRequires: libdb-devel, expat-devel, libuuid-devel
 BuildRequires: libpq-devel
-BuildRequires: libmysqlclient-devel
+BuildRequires: libmariadb-devel
 BuildRequires: zlib-devel
 BuildRequires: sqlite3-devel
 BuildRequires: unixODBC-devel
@@ -105,16 +108,16 @@ This package provides the LDAP support for the apr-util.
 %prep
 %setup -q
 %patch1 -p1 -b .pkgconf
-%patch2 -p1 -b .nodbmdso
 %patch4 -p1 -b .private
+%patch5 -p1 -b .mariadb
 
 %build
 autoheader && autoconf
 %configure --with-apr=%{_prefix} \
         --includedir=%{_includedir}/apr-%{apuver} \
-        --with-ldap --without-gdbm \
+        --with-ldap=ldap_r --without-gdbm \
         --with-sqlite3 --with-pgsql --with-mysql --with-odbc \
-        --with-berkeley-db \
+        --with-dbm=db5 --with-berkeley-db \
         --without-sqlite2 
 #        --disable-util-dso        
 make %{?_smp_mflags} && make dox
@@ -173,6 +176,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES LICENSE NOTICE
 %{_libdir}/libaprutil-%{apuver}.so.*
 %dir %{_libdir}/apr-util-%{apuver}
+%{_libdir}/apr-util-%{apuver}/apr_dbm_db*
 
 %files devel
 %defattr(-,root,root,-)
@@ -208,6 +212,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/apr-util-%{apuver}/apr_ldap*
 
 %changelog
+* Sun Nov 18 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.1-1
+- updated to 1.6.1.
+- dropped Patch2.
+- imported Patch5 from rawhide to build with libmariadb.
+- made BerkeleyDB to be dynamically linked.
+
 * Mon May 30 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.4-1
 - updated to 1.5.4.