- ver update only

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

diff --git a/apr-util.spec b/apr-util.spec
index 1150e32fa117d20db93564f570ba12d1b75c3c0a..6fd99137099fa558fb381bc452837a6511f45de2 100644 (file)
--- a/apr-util.spec
+++ b/apr-util.spec
@@ -1,18 +1,26 @@
+
+%bcond_without ldap    # without LDAP support
+
 Summary:       A companion library to Apache Portable Runtime
+Summary(pl):   Biblioteka towarzysz±ca Apache Portable Runtime
 Name:          apr-util
-Version:       0.9.3
-Release:       1
+Version:       0.9.4
+Release:       2
 Epoch:         1
 License:       Apache
 Group:         Libraries
 Source0:       http://www.apache.org/dist/apr/%{name}-%{version}.tar.gz
-# Source0-md5: 5dbe535cf7c07677e41ef2bf4759fecf
+# Source0-md5: 909ff60d9efb3f158d33e4569af57874
+Patch0:                %{name}-link.patch
 URL:           http://apr.apache.org/
-BuildRequires: apr-devel >= 1:0.9.3
-BuildRequires: openldap-devel
-BuildRequires: expat-devel
+BuildRequires: apr-devel >= 1:0.9.4
+BuildRequires: autoconf
 BuildRequires: db-devel
+BuildRequires: expat-devel
 BuildRequires: gdbm-devel
+BuildRequires: libtool
+%{?with_ldap:BuildRequires:    openldap-devel}
+Requires:      apr >= 1:0.9.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _includedir     /usr/include/apr-util
@@ -20,30 +28,47 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %description
 A companion library to Apache Portable Runtime.
 
+%description -l pl
+Biblioteka towarzysz±ca dla biblioteki Apache Portable Runtime
+(przeno¶nej biblioteki uruchomieniowej).
+
 %package devel
-Summary:       Header files and develpment documentation for apr-util
+Summary:       Header files and development documentation for apr-util
+Summary(pl):   Pliki nag³ówkowe i dokumentacja programisty do apr-util
 Group:         Development/Libraries
-Requires:      %{name} = %{epoch}:%{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      apr-devel >= 1:0.9.4
 
 %description devel
-Header files and develpment documentation for apr-util.
+Header files and development documentation for apr-util.
+
+%description devel -l pl
+Pliki nag³ówkowe i dokumentacja programisty do apr-util.
 
 %package static
 Summary:       Static apr-util library
+Summary(pl):   Statyczna biblioteka apr-util
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{epoch}:%{version}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
+Conflicts:     apr-static < 1:0.9
 
 %description static
 Static apr-util library.
 
+%description static -l pl
+Statyczna biblioteka apr-util.
+
 %prep
-%setup  -q
+%setup -q
+%patch -p1
 
 %build
+./buildconf \
+       --with-apr=%{_datadir}/apr
 %configure \
        --with-apr=%{_bindir}/apr-config \
-       --with-ldap-include=%{_includedir} \
-       --with-ldap-lib=%{_libdir} \
+%{?with_ldap:  --with-ldap-include=%{_prefix}/include} \
+%{?with_ldap:  --with-ldap-lib=%{_libdir}} \
        --with-iconv=%{_prefix}
 %{__make}
 
@@ -53,12 +78,12 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc CHANGES STATUS