- updated to 1.3.0

[packages/apr.git] / apr.spec

diff --git a/apr.spec b/apr.spec
index 067819cff504e41bf7992cbe06d1643f5b90ce71..88298374290642449c536d2e7d22ccf51066da21 100644 (file)
--- a/apr.spec
+++ b/apr.spec
@@ -1,20 +1,20 @@
 Summary:       Apache Portable Runtime
 Summary(pl.UTF-8):     Apache Portable Runtime - przenośna biblioteka uruchomieniowa
 Name:          apr
-Version:       1.2.8
+Version:       1.3.0
 Release:       1
 Epoch:         1
 License:       Apache v2.0
 Group:         Libraries
 Source0:       http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
-# Source0-md5: c573f1b3046991a2624002398b078ad5
+# Source0-md5: 27d8fc8b13f8ea1a40e6796e7453bd84
 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
+BuildRequires: libtool >= 2:2.2
 BuildRequires: libuuid-devel
 BuildRequires: sed >= 4.0
 BuildRequires: python
@@ -55,7 +55,7 @@ Group:                Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      libuuid-devel
 Requires:      automake
-Requires:      libtool
+Requires:      libtool >= 2:2.2
 
 %description devel
 Header files and development documentation for apr.
@@ -89,12 +89,12 @@ 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
+
 %configure \
        --enable-layout=PLD \
 %ifarch %{ix86} %{i8664}
@@ -117,7 +117,7 @@ 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 +136,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 +160,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libapr-1.a