X-Git-Url: https://git.tld-linux.org/?p=packages%2Fapr-util.git;a=blobdiff_plain;f=apr-util.spec;h=3f8450d804730e77ab8967565ae151df7a0b3f59;hp=c92929421810296f35663aa0396543f54ee1ecfe;hb=HEAD;hpb=091e56ade9d07b634eb3dd44f23a6086f77659e3

diff --git a/apr-util.spec b/apr-util.spec
index c929294..641e713 100644
--- a/apr-util.spec
+++ b/apr-util.spec
@@ -13,30 +13,30 @@
 %bcond_without	openssl	# without OpenSSL crypto module
 %bcond_without	tests	# don't perform "make check"
 
-%define	dbver	db47
+%define	dbver	db53
 
 Summary:	A companion library to Apache Portable Runtime
 Summary(pl.UTF-8):	Biblioteka towarzysząca Apache Portable Runtime
 Name:		apr-util
-Version:	1.6.0
+Version:	1.6.3
 Release:	2
 Epoch:		1
 License:	Apache v2.0
 Group:		Libraries
 Source0:	http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
-# Source0-md5:	069a9a980776acab05212c5f37ef8368
+# Source0-md5:	b6e8c9b31d938fe5797ceb0d1ff2eb69
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-config-noldap.patch
-Patch2:		%{name}-libtool.patch
 Patch3:		%{name}-flags.patch
+Patch4:		mysql8.patch
 URL:		http://apr.apache.org/
 BuildRequires:	apr-devel >= 1:1.6.0
 BuildRequires:	autoconf >= 2.59
-BuildRequires:	db-devel >= 4.7
+BuildRequires:	db-devel >= 5.3
 BuildRequires:	expat-devel
 %{?with_freetds:BuildRequires:	freetds-devel}
 BuildRequires:	libtool
-%{?with_mysql:BuildRequires:	mysql-devel}
+%{?with_mysql:BuildRequires:	mysql-devel >= 8.0.35}
 %{?with_nss:BuildRequires:	nss-devel}
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 %{?with_openssl:BuildRequires:	openssl-devel}
@@ -223,8 +223,8 @@ Statyczna biblioteka apr-util.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
+%patch4 -p0
 
 echo '
 <Layout TLD>
@@ -246,6 +246,7 @@ echo '
 ' > config.layout
 
 %build
+PYTHON=%{__python3} \
 ./buildconf \
 	--with-apr=%{_datadir}/apr
 
@@ -264,7 +265,7 @@ echo '
 	%{?with_nss:--with-nss} \
 	%{?with_openssl:--with-openssl} \
 	%{!?with_freetds:--without-freetds} \
-	%{?with_mysql:--with-mysql=%{_prefix}} \
+	%{?with_mysql:--with-mysql} \
 	%{!?with_odbc:--without-odbc} \
 	%{?with_oracle:--with-oracle} \
 	%{!?with_pgsql:--without-pgsql} \