rpms/pdns/devel pdns-fix-postgres-detection.patch, NONE, 1.1 pdns.spec, 1.21, 1.22

[Ruben Kerkhof]

Author: ruben

Update of /cvs/pkgs/rpms/pdns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8743

Modified Files:
	pdns.spec 
Added Files:
	pdns-fix-postgres-detection.patch 
Log Message:
* Thu Jan 14 2010  2.9.22-8
- Fix postgres lib detection (#555462)


pdns-fix-postgres-detection.patch:
 configure |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE pdns-fix-postgres-detection.patch ---
diff -up pdns-2.9.22/configure.orig pdns-2.9.22/configure
--- pdns-2.9.22/configure.orig	2010-01-14 20:40:16.000000000 +0100
+++ pdns-2.9.22/configure	2010-01-14 20:41:13.000000000 +0100
@@ -23298,7 +23298,7 @@ if test "${with_pgsql+set}" = set; then
   withval=$with_pgsql; PGSQL_lib_check="$withval/lib/pgsql $with_pgsql/lib"
 	PGSQL_inc_check="$withval/include/pgsql"
 else
-  PGSQL_lib_check="/usr/local/pgsql/lib/pgsql /usr/local/lib/pgsql /opt/pgsql/lib/pgsql /usr/lib/pgsql /usr/local/pgsql/lib /usr/local/lib /opt/pgsql/lib /usr/lib"
+  PGSQL_lib_check="/usr/local/pgsql/lib/pgsql /usr/local/lib/pgsql /opt/pgsql/lib/pgsql /usr/lib/pgsql /usr/local/pgsql/lib /usr/local/lib /opt/pgsql/lib /usr/lib /usr/lib64"
 	PGSQL_inc_check="/usr/local/pgsql/include/pgsql /usr/include /usr/local/include/postgresql/ /usr/local/include /opt/pgsql/include/pgsql /opt/pgsql/include /usr/include/pgsql/ /usr/include/postgresql"
 fi
 
@@ -23318,8 +23318,7 @@ fi
 echo $ECHO_N "checking for PgSQL library directory... $ECHO_C" >&6; }
 	PGSQL_libdir=
 	for m in $PGSQL_lib_check; do
-	        if test -d "$m" && \
-		   (test -f "$m/libpq.a" || test -f "$m/libpq++.a")
+	        if test -d "$m" && test -f "$m/libpq.so"
 	        then
 	                PGSQL_libdir=$m
 	                break


Index: pdns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/devel/pdns.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- pdns.spec	21 Aug 2009 15:15:48 -0000	1.21
+++ pdns.spec	14 Jan 2010 19:47:00 -0000	1.22
@@ -1,7 +1,7 @@
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
 Version:	2.9.22
-Release:	7%{?dist}
+Release:	8%{?dist}
 
 Group:		System Environment/Daemons
 License:	GPLv2
@@ -10,6 +10,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 Source0:	http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
 Patch0:		%{name}-fixinit.patch
 Patch1:		%{name}-gcc44.patch
+Patch2:		pdns-fix-postgres-detection.patch
 
 Requires(post):	%{_sbindir}/useradd, /sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig
@@ -82,6 +83,7 @@ This package contains the SQLite backend
 %setup -q
 %patch0 -p1 -b .fixinit
 %patch1 -p1 -b .gcc44
+%patch2 -p1 -b .postgres
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}"
@@ -93,7 +95,6 @@ export CPPFLAGS="-DLDAP_DEPRECATED %{opt
 	--with-modules='' \
 	--with-dynmodules='pipe gmysql gpgsql geo ldap gsqlite3' \
 	--with-mysql-lib=%{_libdir}/mysql \
-	--with-pgsql-lib=%{_libdir} \
 	--with-sqlite3-lib=%{_libdir}
 
 make %{?_smp_mflags}
@@ -181,6 +182,9 @@ fi
 
 
 %changelog
+* Thu Jan 14 2010  2.9.22-8
+- Fix postgres lib detection (#555462)
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.9.22-7
 - rebuilt with new openssl