- include et/com_err.h instead of com_err.h (e2fsprogs installs com_err.h

  in /usr/include/et not in /usr/include)
- builds now, rel. 0.2.RC1

Changed files:
    postgresql-com_err.patch -> 1.1
    postgresql.spec -> 1.224

diff --git a/postgresql-com_err.patch b/postgresql-com_err.patch
new file mode 100644 (file)
index 0000000..bb65bf2
--- /dev/null
+++ b/postgresql-com_err.patch
@@ -0,0 +1,36 @@
+diff -Nur postgresql-7.4RC1.orig/configure.in postgresql-7.4RC1/configure.in
+--- postgresql-7.4RC1.orig/configure.in        2003-11-03 06:27:18.000000000 +0100
++++ postgresql-7.4RC1/configure.in     2003-11-07 12:03:08.000000000 +0100
+@@ -783,7 +783,7 @@
+ 
+ if test "$with_krb5" = yes ; then
+   AC_CHECK_HEADER(krb5.h, [], [AC_MSG_ERROR([header file <krb5.h> is required for Kerberos 5])])
+-  AC_CHECK_HEADER(com_err.h, [], [AC_MSG_ERROR([header file <com_err.h> is required for Kerberos 5])])
++  AC_CHECK_HEADER(et/com_err.h, [], [AC_MSG_ERROR([header file <et/com_err.h> is required for Kerberos 5])])
+ fi
+ 
+ if test "$with_openssl" = yes ; then
+diff -Nur postgresql-7.4RC1.orig/src/backend/libpq/auth.c postgresql-7.4RC1/src/backend/libpq/auth.c
+--- postgresql-7.4RC1.orig/src/backend/libpq/auth.c    2003-09-26 17:27:31.000000000 +0200
++++ postgresql-7.4RC1/src/backend/libpq/auth.c 2003-11-07 12:04:47.000000000 +0100
+@@ -150,7 +150,7 @@
+  */
+ 
+ #include <krb5.h>
+-#include <com_err.h>
++#include <et/com_err.h>
+ 
+ /*
+  * pg_an_to_ln -- return the local name corresponding to an authentication
+diff -Nur postgresql-7.4RC1.orig/src/interfaces/libpq/fe-auth.c postgresql-7.4RC1/src/interfaces/libpq/fe-auth.c
+--- postgresql-7.4RC1.orig/src/interfaces/libpq/fe-auth.c      2003-10-25 05:48:47.000000000 +0200
++++ postgresql-7.4RC1/src/interfaces/libpq/fe-auth.c   2003-11-07 12:04:52.000000000 +0100
+@@ -243,7 +243,7 @@
+  */
+ 
+ #include <krb5.h>
+-#include <com_err.h>
++#include <et/com_err.h>
+ 
+ /*
+  * pg_an_to_ln -- return the local name corresponding to an authentication

diff --git a/postgresql.spec b/postgresql.spec
index 1419c8f88134cec7ce0d2de685be833e2976d1a9..501db53cc431535299c9bcf362240d108b863807 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -28,7 +28,7 @@ Summary(uk):  PostgreSQL - 
 Summary(zh_CN):        PostgreSQL ¿Í»§¶Ë³ÌÐòºÍ¿âÎļþ
 Name:          postgresql
 Version:       7.4
-Release:       0.1.%{_rc}
+Release:       0.2.%{_rc}
 License:       BSD
 Group:         Applications/Databases
 Source0:       ftp://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}%{_rc}.tar.bz2
@@ -43,6 +43,7 @@ Patch2:               %{name}-pg_ctl-nopsql.patch
 Patch3:                %{name}-conf.patch
 Patch4:                %{name}-absolute_dbpaths.patch
 Patch5:                %{name}-link.patch
+Patch6:                %{name}-com_err.patch
 Icon:          postgresql.xpm
 URL:           http://www.postgresql.org/
 BuildRequires: autoconf
@@ -718,6 +719,7 @@ Funkcje kryptograficzne dla PostgreSQL.
 %patch3 -p1
 %{?_with_absolute_dbpaths:%patch4 -p1}
 %patch5 -p1
+%patch6 -p1
 
 tar xzf doc/man*.tar.gz
 
@@ -728,8 +730,6 @@ tar zxf doc/postgres.tar.gz -C doc/unpacked
 find contrib -type d -name CVS -exec rm -rf {} \;
 
 %build
-CPPFLAGS="-I%{_includedir}/et"
-export CPPFLAGS
 rm -f config/libtool.m4
 %{__aclocal} -I config
 %{__autoconf}