X-Git-Url: https://git.tld-linux.org/?p=packages%2Fapr.git;a=blobdiff_plain;f=apr.spec;h=9dc83d3fdbf4a147717b280dc2b24e46ad3ccf40;hp=33bf163884a9169e7284daaf301fea320fff5594;hb=HEAD;hpb=6d6afaa39f5abd33f7931b94e0f1b16c9ec5ff75

diff --git a/apr.spec b/apr.spec
index 33bf163..5870301 100644
--- a/apr.spec
+++ b/apr.spec
@@ -5,35 +5,29 @@
 Summary:	Apache Portable Runtime
 Summary(pl.UTF-8):	Apache Portable Runtime - przenośna biblioteka uruchomieniowa
 Name:		apr
-Version:	1.5.1
-Release:	2
+Version:	1.7.4
+Release:	1
 Epoch:		1
 License:	Apache v2.0
 Group:		Libraries
 Source0:	http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
-# Source0-md5:	5486180ec5a23efb5cae6d4292b300ab
+# Source0-md5:	f8a62f3984898ba0ea8b6f26b851cb99
 Patch0:		%{name}-link.patch
-Patch1:		%{name}-libtool.patch
 # disable some things that require recent kernel
 Patch2:		%{name}-disable-features.patch
 URL:		http://apr.apache.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
-%if "%{pld_release}" != "ac"
 BuildRequires:	glibc-devel >= 6:2.9
 BuildRequires:	libtool >= 2:2.2
-%else
-BuildRequires:	libtool
-%endif
 BuildRequires:	libuuid-devel
-BuildRequires:	python
+BuildRequires:	python3
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 2.007
 BuildRequires:	sed >= 4.0
-%if "%{pld_release}" != "ac"
 BuildRequires:	uname(release) >= 2.6
 Requires:	uname(release) >= 2.6.28
-%endif
 # uuid.h misdetected from this one instead of libuuid-devel
 BuildConflicts:	ossp-uuid-devel < 1.6.2-6
 Conflicts:	kernel24
@@ -70,13 +64,9 @@ Summary(pl.UTF-8):	Pliki nagłówkowe i dokumentacja programisty do apr
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	automake
-%if "%{pld_release}" != "ac"
 Requires:	libtool >= 2:2.2
-%else
-Requires:	libtool
-%endif
 Requires:	libuuid-devel
-Requires:	python-modules
+Requires:	python3-modules
 
 %description devel
 Header files and development documentation for apr.
@@ -99,11 +89,10 @@ Statyczna biblioteka apr.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 
 cat >> config.layout <<'EOF'
-<Layout PLD>
+<Layout TLD>
 sbindir:	%{_sbindir}
 libexecdir:	%{_libdir}/apr
 installbuilddir: ${datadir}/build-${APR_MAJOR_VERSION}
@@ -118,12 +107,13 @@ install /usr/share/automake/config.* build
 %{__autoconf}
 
 %configure \
-	--enable-layout=PLD \
+	--enable-layout=TLD \
 %ifarch %{ix86} %{x8664}
 %ifnarch i386
 	--enable-nonportable-atomics \
 %endif
 %endif
+	--enable-pool-concurrency-check \
 	--enable-threads \
 	--with-devrandom=/dev/urandom
 %{__make}
@@ -151,7 +141,7 @@ sed -i -e 's@^\(APR_SOURCE_DIR=\).*@\1"%{_datadir}"@' \
 	$RPM_BUILD_ROOT%{_bindir}/apr-1-config
 sed -i -e 's@^\(apr_builddir\|apr_builders\)=.*@\1=%{_datadir}/build-1@' \
 	$RPM_BUILD_ROOT%{_datadir}/build/apr_rules.mk
-sed -i -e '1s@#!.*python@#!%{__python}@' $RPM_BUILD_ROOT%{_datadir}/build/gen-build.py
+sed -i -e '1s@#!.*python@#!%{__python3}@' $RPM_BUILD_ROOT%{_datadir}/build/gen-build.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT