- rebuild configure (-libtool patch now has some effect too); rel 2

[packages/apr-compat.git] / apr-compat.spec

diff --git a/apr-compat.spec b/apr-compat.spec
index 3823f861e6641553faaa232b90b43993a85afe61..374d2053917ba9b5573a853a07d3c2d9ec65e144 100644 (file)
--- 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
+Summary(pl.UTF-8):     Apache Portable Runtime - przenośna biblioteka uruchomieniowa
 Name:          apr
-Version:       1.2.8
-Release:       1
+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: c573f1b3046991a2624002398b078ad5
+# 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
-BuildRequires: libtool >= 1.3.3
+%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)
@@ -50,12 +58,17 @@ możliwości.
 
 %package devel
 Summary:       Header files and development documentation for apr
-Summary(pl.UTF-8):   Pliki nagłówkowe i dokumentacja programisty do 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.
@@ -65,7 +78,7 @@ Pliki nagłówkowe i dokumentacja programisty do apr.
 
 %package static
 Summary:       Static apr library
-Summary(pl.UTF-8):   Statyczna biblioteka apr
+Summary(pl.UTF-8):     Statyczna biblioteka apr
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
@@ -89,12 +102,13 @@ installbuilddir: ${datadir}/build-${APR_MAJOR_VERSION}
 localstatedir: /var/run
 runtimedir:    /var/run
 libsuffix:     -${APR_MAJOR_VERSION}
-</Layout PLD>
+</Layout>
 EOF
 
 %build
 install /usr/share/automake/config.* build
-./buildconf
+%{__autoconf}
+
 %configure \
        --enable-layout=PLD \
 %ifarch %{ix86} %{i8664}
@@ -112,12 +126,10 @@ 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
-ln -snf /usr/share/libtool/ltmain.sh $RPM_BUILD_ROOT%{_datadir}/build
+ln -snf /usr/share/libtool/config/ltmain.sh $RPM_BUILD_ROOT%{_datadir}/build
 ln -snf /usr/bin/libtool $RPM_BUILD_ROOT%{_datadir}/build
 ln -sf build $RPM_BUILD_ROOT%{_datadir}/build-1
 
@@ -136,13 +148,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc CHANGES docs/*.html
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libapr-1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libapr-1.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_bindir}/apr-1-config
+%attr(755,root,root) %{_libdir}/libapr-1.so
+%{_libdir}/libapr-1.la
 %{_libdir}/apr.exp
 %{_includedir}
 %dir %{_datadir}
@@ -159,4 +172,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libapr-1.a