- fetch source; update some patches

Changed files:
    postgresql-ac_version.patch -> 1.5
    postgresql-conf.patch -> 1.6
    postgresql-ecpg-includedir.patch -> 1.4
    postgresql.spec -> 1.449

diff --git a/postgresql-ac_version.patch b/postgresql-ac_version.patch
index 65f465cf5fd770ece6ba7df16c48bdc1e2fdde99..60de8bb1e58e4b5bb9a72412fab1011a36432c21 100644 (file)
--- a/postgresql-ac_version.patch
+++ b/postgresql-ac_version.patch
@@ -2,9 +2,9 @@
 +++ postgresql-8.3RC1/configure.in     2008-01-07 22:23:50.888568429 +0000
 @@ -19,10 +19,10 @@
  
- AC_INIT([PostgreSQL], [8.4.0], [pgsql-bugs@postgresql.org])
+ AC_INIT([PostgreSQL], [9.0.0], [pgsql-bugs@postgresql.org])
  
--m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
+-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not
 -recommended.  You can remove the check from 'configure.in' but it is then
 -your responsibility whether the result works or not.])])
@@ -12,6 +12,7 @@
 +dnl Untested combinations of 'autoconf' and PostgreSQL versions are not
 +dnl recommended.  You can remove the check from 'configure.in' but it is then
 +dnl your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2009, PostgreSQL Global Development Group])
+ AC_COPYRIGHT([Copyright (c) 1996-2010, PostgreSQL Global Development Group])
  AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
  AC_CONFIG_AUX_DIR(config)
+

diff --git a/postgresql-conf.patch b/postgresql-conf.patch
index d0b9c89cf875a2886c0acb269e3ec373e206b0ad..ae0ac1ca91e9953a09a0ba079fb15e633702aa7e 100644 (file)
--- a/postgresql-conf.patch
+++ b/postgresql-conf.patch
@@ -1,12 +1,12 @@
 --- postgresql-8.3RC1/src/backend/utils/misc/postgresql.conf.sample.orig       2007-12-07 16:44:56.000000000 +0000
 +++ postgresql-8.3RC1/src/backend/utils/misc/postgresql.conf.sample    2008-01-07 22:19:56.904649611 +0000
-@@ -231,7 +231,7 @@
+@@ -253,7 +253,7 @@
  
  # - Where to Log -
  
 -#log_destination = 'stderr'           # Valid values are combinations of
 +log_destination = 'syslog'            # Valid values are combinations of
-                                       # stderr, csvlog, syslog and eventlog,
+                                       # stderr, csvlog, syslog, and eventlog,
                                        # depending on platform.  csvlog
                                        # requires logging_collector to be on.
 @@ -262,8 +262,8 @@

diff --git a/postgresql-ecpg-includedir.patch b/postgresql-ecpg-includedir.patch
index bc82b97d16ca02ffe6d5803a3fc34b62e76a1365..9b5ae15fae612d61b25594312f9bf4b8424d53fc 100644 (file)
--- a/postgresql-ecpg-includedir.patch
+++ b/postgresql-ecpg-includedir.patch
@@ -1,18 +1,18 @@
 --- postgresql-7.4.1/src/interfaces/ecpg/include/Makefile.orig 2003-12-18 19:55:05.000000000 +0100
 +++ postgresql-7.4.1/src/interfaces/ecpg/include/Makefile      2003-12-23 18:57:34.712017440 +0100
 @@ -19,12 +19,12 @@
- informix_headers = datetime.h decimal.h sqltypes.h sqlda.h
+ informix_headers = datetime.h decimal.h sqltypes.h
  
  install-headers: $(ecpg_headers) $(informix_headers)
--      for i in $(ecpg_headers); do $(INSTALL_DATA) $(srcdir)/$$i '$(DESTDIR)$(includedir)' || exit; done
--      for i in $(informix_headers); do $(INSTALL_DATA) $(srcdir)/$$i '$(DESTDIR)$(informix_esql_dir)' || exit; done
-+      for i in $(ecpg_headers); do $(INSTALL_DATA) $(srcdir)/$$i '$(DESTDIR)$(includedir)/ecpg' || exit; done
-+      for i in $(informix_headers); do $(INSTALL_DATA) $(srcdir)/$$i '$(DESTDIR)$(includedir)/ecpg' || exit; done
+-      $(INSTALL_DATA) $(addprefix $(srcdir)/,$(ecpg_headers)) '$(DESTDIR)$(includedir)/'
+-      $(INSTALL_DATA) $(addprefix $(srcdir)/,$(informix_headers)) '$(DESTDIR)$(informix_esql_dir)/'
++      $(INSTALL_DATA) $(addprefix $(srcdir)/,$(ecpg_headers)) '$(DESTDIR)$(includedir)/ecpg'
++      $(INSTALL_DATA) $(addprefix $(srcdir)/,$(informix_headers)) '$(DESTDIR)$(includedir)/ecpg'
        $(INSTALL_DATA) $(ecpg_config_h) '$(DESTDIR)$(includedir)'
  
  installdirs:
--      $(mkinstalldirs) '$(DESTDIR)$(includedir)' '$(DESTDIR)$(informix_esql_dir)'
-+      $(mkinstalldirs) '$(DESTDIR)$(includedir)/ecpg'
+-      $(MKDIR_P) '$(DESTDIR)$(includedir)' '$(DESTDIR)$(informix_esql_dir)'
++      $(MKDIR_P) '$(DESTDIR)$(includedir)/ecpg'
  
  uninstall:
        rm -f $(addprefix '$(DESTDIR)$(includedir)'/, $(ecpg_headers))

diff --git a/postgresql.spec b/postgresql.spec
index 6ffaba2bf985fa794fa3f4d5e4682fd6be46898c..3de5e16e6c080cad92ecb5529c713fb9c5391fdd 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -11,7 +11,7 @@
 #
 
 %define beta %{nil}
-%define mver 8.4
+%define mver 9.0
 
 Summary:       PostgreSQL Data Base Management System
 Summary(de.UTF-8):     PostgreSQL Datenbankverwaltungssystem
@@ -24,12 +24,12 @@ Summary(tr.UTF-8):  Veri Tabanı Yönetim Sistemi
 Summary(uk.UTF-8):     PostgreSQL - система керування базами даних
 Summary(zh_CN.UTF-8):  PostgreSQL 客户端程序和库文件
 Name:          postgresql
-Version:       %{mver}.4
-Release:       4
+Version:       %{mver}.0
+Release:       0.1
 License:       BSD
 Group:         Applications/Databases
 Source0:       ftp://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 4bf2448ad965bca3940df648c02194df
+# Source0-md5: 14c2122cc322e69ab2ab702ed7714bbe
 Source1:       %{name}.init
 Source2:       pgsql-Database-HOWTO-html.tar.gz
 # Source2-md5: 5b656ddf1db41965761f85204a14398e
@@ -803,11 +803,6 @@ Różne moduły dołączone do PostgreSQL-a.
 
 tar xzf %{SOURCE4} -C contrib
 
-tar xzf doc/man*.tar.gz
-
-mkdir doc/unpacked
-tar zxf doc/postgres.tar.gz -C doc/unpacked
-
 # force rebuild of bison/flex files
 find src -name \*.l -o -name \*.y | xargs touch
 
@@ -836,7 +831,6 @@ find src -name \*.l -o -name \*.y | xargs touch
        %{?with_python:--with-python} \
        %{?with_tcl:--with-tcl --with-tclconfig=%{_ulibdir}} \
        --with-ossp-uuid \
-       --without-docdir
 
 %{__make}