rpms/python-psycopg/devel psycopg-pgversion.patch, NONE, 1.1 python-psycopg.spec, 1.8, 1.9

[Shahms King (shahms)]

Author: shahms

Update of /cvs/extras/rpms/python-psycopg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29112

Modified Files:
	python-psycopg.spec 
Added Files:
	psycopg-pgversion.patch 
Log Message:
Fix for separated pg_config.h in FC5


psycopg-pgversion.patch:

--- NEW FILE psycopg-pgversion.patch ---
--- configure.orig	2006-02-28 13:13:32.000000000 -0800
+++ configure	2006-02-28 13:14:04.000000000 -0800
@@ -2956,22 +2956,26 @@
 
 echo "$as_me:$LINENO: checking PostgreSQL version" >&5
 echo $ECHO_N "checking PostgreSQL version... $ECHO_C" >&6
-if test -f $PGSQLDIR/pg_config.h ; then
-  PGSQLCONFIG=$PGSQLDIR/pg_config.h
+if test -x $bindir/pg_config ; then
+  PGSQLVERSION="`$bindir/pg_config --version |sed -n -e 's/PostgreSQL \([0-9]\.[0-9]\).*/\\1/p'`"
 else
-  if test -f $PGSQLDIR/config.h ; then
-    PGSQLCONFIG=$PGSQLDIR/config.h
+  if test -f $PGSQLDIR/pg_config.h ; then
+    PGSQLCONFIG=$PGSQLDIR/pg_config.h
   else
-    if test -f $PGSQLDIR/../pg_config.h ; then
-      PGSQLCONFIG=$PGSQLDIR/../pg_config.h
+    if test -f $PGSQLDIR/config.h ; then
+      PGSQLCONFIG=$PGSQLDIR/config.h
+    else
+      if test -f $PGSQLDIR/../pg_config.h ; then
+        PGSQLCONFIG=$PGSQLDIR/../pg_config.h
+      fi
     fi
   fi
+  test -z "$PGSQLCONFIG" && { { echo "$as_me:$LINENO: error: missing PostgreSQL headers" >&5
+  echo "$as_me: error: missing PostgreSQL headers" >&2;}
+     { (exit 1); exit 1; }; }
+  PGSQLVERSION="`sed -n -e 's/.*PG_VERSION \"\([0-9]\.[0-9]\).*\"/\\1/p' $PGSQLCONFIG`"
+  echo "$as_me:$LINENO: result: $PGSQLVERSION" >&5
 fi
-test -z "$PGSQLCONFIG" && { { echo "$as_me:$LINENO: error: missing PostgreSQL headers" >&5
-echo "$as_me: error: missing PostgreSQL headers" >&2;}
-   { (exit 1); exit 1; }; }
-PGSQLVERSION="`sed -n -e 's/.*PG_VERSION \"\([0-9]\.[0-9]\).*\"/\\1/p' $PGSQLCONFIG`"
-echo "$as_me:$LINENO: result: $PGSQLVERSION" >&5
 echo "${ECHO_T}$PGSQLVERSION" >&6
 
 echo "$as_me:$LINENO: checking PostgreSQL type catalog" >&5


Index: python-psycopg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psycopg/devel/python-psycopg.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-psycopg.spec	28 Feb 2006 20:08:19 -0000	1.8
+++ python-psycopg.spec	28 Feb 2006 21:22:21 -0000	1.9
@@ -4,7 +4,7 @@
 
 Name:           python-psycopg
 Version:        1.1.21
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        PostgreSQL database adapter for Python
 
@@ -12,6 +12,7 @@
 License:        GPL
 URL:            http://www.initd.org/software/initd/psycopg
 Source0:        http://initd.org/pub/software/psycopg/%{srcname}-%{version}.tar.gz
+Patch0:         psycopg-pgversion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel postgresql-devel mx
@@ -26,6 +27,7 @@
 
 %prep
 %setup -n %{srcname}-%{version}
+%patch0 -p0
 
 %build
 if [ -x %{_bindir}/pg_config ]; then
@@ -54,6 +56,9 @@
 %{python_sitearch}/*.so
 
 %changelog
+* Tue Feb 28 2006 Shahms E. King <shahms at shahms.com> 1.1.21-4
+- Fix for separated pg_config files in FC5
+
 * Tue Feb 28 2006 Shahms E. King <shahms at shahms.com> 1.1.21-3
 - rebuild for FC5