X-Git-Url: https://git.tld-linux.org/?p=packages%2Fapr.git;a=blobdiff_plain;f=apr.spec;h=9dc83d3fdbf4a147717b280dc2b24e46ad3ccf40;hp=13b20226e73097bb607c690afce6abee75179aa7;hb=5768889b77a40dc5a1a763603c1c45f5b992597e;hpb=47070fc99761c5205733f88207a524dcd3fb5c95 diff --git a/apr.spec b/apr.spec index 13b2022..9dc83d3 100644 --- a/apr.spec +++ b/apr.spec @@ -5,24 +5,25 @@ Summary: Apache Portable Runtime Summary(pl.UTF-8): Apache Portable Runtime - przenośna biblioteka uruchomieniowa Name: apr -Version: 1.6.2 -Release: 1 +Version: 1.7.0 +Release: 3 Epoch: 1 License: Apache v2.0 Group: Libraries Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 -# Source0-md5: e81a851967c79b5ce9bfbc909e4bf735 +# Source0-md5: 7a14a83d664e87599ea25ff4432e48a7 Patch0: %{name}-link.patch Patch1: %{name}-libtool.patch # disable some things that require recent kernel Patch2: %{name}-disable-features.patch +Patch3: %{name}-autoconf.patch URL: http://apr.apache.org/ BuildRequires: autoconf >= 2.59 BuildRequires: automake BuildRequires: glibc-devel >= 6:2.9 BuildRequires: libtool >= 2:2.2 BuildRequires: libuuid-devel -BuildRequires: python +BuildRequires: python3 BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpm-pythonprov BuildRequires: sed >= 4.0 @@ -66,7 +67,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} Requires: automake Requires: libtool >= 2:2.2 Requires: libuuid-devel -Requires: python-modules +Requires: python3-modules %description devel Header files and development documentation for apr. @@ -91,6 +92,7 @@ Statyczna biblioteka apr. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 cat >> config.layout <<'EOF' @@ -142,7 +144,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