From ceea6429b350c7774b1b5fce93d3e5352ab71c86 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 5 Feb 2015 07:57:53 +0000 Subject: [PATCH] - TLDized --- apr-util.spec | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/apr-util.spec b/apr-util.spec index cd41436..2fddd8e 100644 --- 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 db47 # tests fail on x32 %ifarch x32 @@ -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: expat-devel %{?with_freetds:BuildRequires: freetds-devel} BuildRequires: libtool @@ -252,7 +238,7 @@ Statyczna biblioteka apr-util. %{__rm} -r xml/expat echo ' - + 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 \ -- 2.46.0