- updated to 1.7.4

[packages/apr.git] / apr.spec

diff --git a/apr.spec b/apr.spec
index 512971b57a4ccb8fa28d05795c96b43cc1aab201..58703013a78144fcada99530c7ad04204f840891 100644 (file)
--- a/apr.spec
+++ b/apr.spec
@@ -5,15 +5,14 @@
 Summary:       Apache Portable Runtime
 Summary(pl.UTF-8):     Apache Portable Runtime - przenośna biblioteka uruchomieniowa
 Name:          apr
-Version:       1.6.5
+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: ad4add8efdfe87330b88e5e788241775
+# 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/
@@ -22,9 +21,10 @@ 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: rpmbuild(macros) >= 2.007
 BuildRequires: sed >= 4.0
 BuildRequires: uname(release) >= 2.6
 Requires:      uname(release) >= 2.6.28
@@ -66,7 +66,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.
@@ -89,7 +89,6 @@ Statyczna biblioteka apr.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 
 cat >> config.layout <<'EOF'
@@ -142,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