packages: apr-util/apr-util.spec - ensure we build with exact db version, a...

[glen]

Author: glen                         Date: Sat Mar 26 19:48:42 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ensure we build with exact db version, and it is carried over to apu-1-config as well

---- Files affected:
packages/apr-util:
   apr-util.spec (1.90 -> 1.91) 

---- Diffs:

================================================================
Index: packages/apr-util/apr-util.spec
diff -u packages/apr-util/apr-util.spec:1.90 packages/apr-util/apr-util.spec:1.91
--- packages/apr-util/apr-util.spec:1.90	Mon Jan 31 09:52:46 2011
+++ packages/apr-util/apr-util.spec	Sat Mar 26 20:48:37 2011
@@ -10,19 +10,20 @@
 %bcond_without	sqlite3	# without SQLite3 DBD module
 %bcond_without	ldap	# without LDAP module
 %bcond_without	tests
+
 # define	dbver	db50
 %if 0%{!?dbver:1}
-  %if "%{pld_release}" == "ti"
-    %define	dbver	db45
-  %else
-    %if "%{pld_release}" == "th"
-      %define	dbver	db47
-    %else
-      %define	dbver	db4
-    %endif
-  %endif
+	%if "%{pld_release}" == "th"
+		%define	dbver	db47
+	%endif
+	%if "%{pld_release}" == "ti"
+		%define	dbver	db45
+	%endif
+	%if "%{pld_release}" == "ac"
+		%define	dbver	db42
+	%endif
 %endif
-#
+
 Summary:	A companion library to Apache Portable Runtime
 Summary(pl.UTF-8):	Biblioteka towarzysząca Apache Portable Runtime
 Name:		apr-util
@@ -40,14 +41,15 @@
 URL:		http://apr.apache.org/
 BuildRequires:	apr-devel >= 1:1.3.0
 BuildRequires:	autoconf
-%if "%{pld_release}" == "ti"
-BuildRequires:	db-devel >= 4.5
-%else
 %if "%{pld_release}" == "th"
 BuildRequires:	db-devel >= 4.7
-%else
-BuildRequires:	db-devel
 %endif
+%if "%{pld_release}" == "ti"
+BuildRequires:	db-devel >= 4.5
+%endif
+%if "%{pld_release}" == "ac"
+BuildRequires:	db-devel >= 4.2
+BuildConflicts:	db4.5-devel
 %endif
 BuildRequires:	expat-devel
 %{?with_freetds:BuildRequires:	freetds-devel}
@@ -215,6 +217,9 @@
 %patch2 -p1
 %patch3 -p1
 
+# be sure to link with db version requested
+%{__sed} -i -e 's/db4 db//' build/dbm.m4
+
 rm -rf xml/expat
 
 echo '
@@ -365,6 +370,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.91  2011/03/26 19:48:37  glen
+- ensure we build with exact db version, and it is carried over to apu-1-config as well
+
 Revision 1.90  2011/01/31 08:52:46  arekm
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apr-util/apr-util.spec?r1=1.90&r2=1.91&f=u