X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apr-compat.spec;h=374d2053917ba9b5573a853a07d3c2d9ec65e144;hb=bb7ef45e3a1f7cdeeaea4e643f80c6b0a90e6d56;hp=841e52db7aba698311e5a00adfa0c772690f3ede;hpb=a460b68577e935268524feda50615a6c586aefca;p=packages%2Fapr-compat.git

diff --git a/apr-compat.spec b/apr-compat.spec
index 841e52d..374d205 100644
--- a/apr-compat.spec
+++ b/apr-compat.spec
@@ -1,25 +1,33 @@
 Summary:	Apache Portable Runtime
 Summary(pl.UTF-8):	Apache Portable Runtime - przenośna biblioteka uruchomieniowa
 Name:		apr
-Version:	1.2.12
+Version:	1.3.3
 Release:	2
 Epoch:		1
 License:	Apache v2.0
 Group:		Libraries
 Source0:	http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
-# Source0-md5:	c5da94517e3918f0f2b2e0a05f56aa21
+# Source0-md5:	2090c21dee4f0eb1512604127dcd158f
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-metuxmpm.patch
 Patch2:		%{name}-libtool.patch
 URL:		http://apr.apache.org/
 BuildRequires:	autoconf >= 2.13
 BuildRequires:	automake
+%if "%{pld_release}" != "ac"
 BuildRequires:	libtool >= 2:2.2
+%else
+BuildRequires:	libtool
+%endif
 BuildRequires:	libuuid-devel
-BuildRequires:	sed >= 4.0
 BuildRequires:	python
+BuildRequires:	rpm >= 4.4.9-56
+BuildRequires:	rpm-pythonprov
+BuildRequires:	sed >= 4.0
+%if "%{pld_release}" != "ac"
 BuildRequires:	uname(release) >= 2.6
 Requires:	uname(release) >= 2.6
+%endif
 Conflicts:	kernel24
 Conflicts:	kernel24-smp
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -53,9 +61,14 @@ Summary:	Header files and development documentation for apr
 Summary(pl.UTF-8):	Pliki nagłówkowe i dokumentacja programisty do apr
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	libuuid-devel
 Requires:	automake
+%if "%{pld_release}" != "ac"
 Requires:	libtool >= 2:2.2
+%else
+Requires:	libtool
+%endif
+Requires:	libuuid-devel
+Requires:	python-modules
 
 %description devel
 Header files and development documentation for apr.
@@ -94,6 +107,7 @@ EOF
 
 %build
 install /usr/share/automake/config.* build
+%{__autoconf}
 
 %configure \
 	--enable-layout=PLD \
@@ -112,8 +126,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-ln -sf %{_bindir}/libtool $RPM_BUILD_ROOT%{_datadir}/libtool
-
 mv -f $RPM_BUILD_ROOT%{_datadir}/build-1 $RPM_BUILD_ROOT%{_datadir}/build
 install build/{*apr*.m4,*.awk,*.sh,gen-build.py} $RPM_BUILD_ROOT%{_datadir}/build
 ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_datadir}/build