- proper TLD deps

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

diff --git a/apr-util.spec b/apr-util.spec
index cd4143626ce157f162def68edd7ee027b566fdd0..58baf34984b2c5d54913478b882ad189a70842e2 100644 (file)
--- a/apr-util.spec
+++ b/apr-util.spec
@@ -12,15 +12,7 @@
 %bcond_without openssl # without OpenSSL crypto module
 %bcond_without tests   # don't perform "make check"
 
-# define       dbver   db50
-%if 0%{!?dbver:1}
-       %if "%{pld_release}" == "th"
-               %define dbver   db53
-       %endif
-       %if "%{pld_release}" == "ac"
-               %define dbver   db42
-       %endif
-%endif
+%define        dbver   db45
 
 # tests fail on x32
 %ifarch x32
@@ -36,7 +28,7 @@ Summary:      A companion library to Apache Portable Runtime
 Summary(pl.UTF-8):     Biblioteka towarzysząca Apache Portable Runtime
 Name:          apr-util
 Version:       1.5.4
-Release:       1
+Release:       2
 Epoch:         1
 License:       Apache v2.0
 Group:         Libraries
@@ -49,13 +41,7 @@ Patch3:              %{name}-flags.patch
 URL:           http://apr.apache.org/
 BuildRequires: apr-devel >= 1:1.3.0
 BuildRequires: autoconf >= 2.59
-%if "%{pld_release}" == "th"
-BuildRequires: db-devel >= 4.7
-%endif
-%if "%{pld_release}" == "ac"
-BuildRequires: db-devel >= 4.2
-BuildConflicts:        db4.5-devel
-%endif
+BuildRequires: db-devel >= 4.5
 BuildRequires: expat-devel
 %{?with_freetds:BuildRequires: freetds-devel}
 BuildRequires: libtool
@@ -252,7 +238,7 @@ Statyczna biblioteka apr-util.
 %{__rm} -r xml/expat
 
 echo '
-<Layout PLD>
+<Layout TLD>
     prefix:        %{_prefix}
     exec_prefix:   %{_exec_prefix}
     bindir:        %{_bindir}
@@ -275,7 +261,7 @@ echo '
        --with-apr=%{_datadir}/apr
 
 %configure \
-       --enable-layout=PLD \
+       --enable-layout=TLD \
        --with-apr=%{_bindir}/apr-1-config \
        --with-berkeley-db=%{_prefix} \
        --with-crypto \