- version 8.4.1

- release 0.1 (bump to 1 after it's released tomorrow)

Changed files:
    postgresql-pg_perm_setlocale.patch -> 1.2
    postgresql.spec -> 1.433

diff --git a/postgresql-pg_perm_setlocale.patch b/postgresql-pg_perm_setlocale.patch
deleted file mode 100644 (file)
index b94ee2d..0000000
--- a/postgresql-pg_perm_setlocale.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From bfb56a2ad7b489c04bfc90628e0cb3766763ecca Mon Sep 17 00:00:00 2001
-From: Heikki Linnakangas <heikki@enterprisedb.com>
-Date: Wed, 8 Jul 2009 17:53:32 +0000
-Subject: [PATCH] Need to use pg_perm_setlocale when setting LC_CTYPE and LC_COLLATE at startup.
- Otherwise, the LC_CTYPE/COLLATE setting gets reverted when using plperl, which
- leads to incorrect query results and index corruption.
-
-This was accidentally broken in the per-database locale patch in 8.4. Pointed
-out by Andrew Gierth.
----
- src/backend/utils/init/postinit.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
-index 6b98bed..327ba7c 100644
---- a/src/backend/utils/init/postinit.c
-+++ b/src/backend/utils/init/postinit.c
-@@ -44,6 +44,7 @@
- #include "utils/acl.h"
- #include "utils/flatfiles.h"
- #include "utils/guc.h"
-+#include "utils/pg_locale.h"
- #include "utils/plancache.h"
- #include "utils/portal.h"
- #include "utils/relcache.h"
-@@ -247,14 +248,14 @@ CheckMyDatabase(const char *name, bool am_superuser)
-       collate = NameStr(dbform->datcollate);
-       ctype = NameStr(dbform->datctype);
- 
--      if (setlocale(LC_COLLATE, collate) == NULL)
-+      if (pg_perm_setlocale(LC_COLLATE, collate) == NULL)
-               ereport(FATAL,
-                       (errmsg("database locale is incompatible with operating system"),
-                        errdetail("The database was initialized with LC_COLLATE \"%s\", "
-                                          " which is not recognized by setlocale().", collate),
-                        errhint("Recreate the database with another locale or install the missing locale.")));
- 
--      if (setlocale(LC_CTYPE, ctype) == NULL)
-+      if (pg_perm_setlocale(LC_CTYPE, ctype) == NULL)
-               ereport(FATAL,
-                       (errmsg("database locale is incompatible with operating system"),
-                        errdetail("The database was initialized with LC_CTYPE \"%s\", "
--- 
-1.6.3.1
-

diff --git a/postgresql.spec b/postgresql.spec
index 37dfef6374d6c047519b34235f39856c454cccc6..707b903a8792a316dab1f9f8e41479c154a0f7c1 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -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}.0
-Release:       3
+Version:       %{mver}.1
+Release:       0.1
 License:       BSD
 Group:         Applications/Databases
 Source0:       ftp://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 1f172d5f60326e972837f58fa5acd130
+# Source0-md5: f2015af17bacbbfe140daf0d1067f9c9
 Source1:       %{name}.init
 Source2:       pgsql-Database-HOWTO-html.tar.gz
 # Source2-md5: 5b656ddf1db41965761f85204a14398e
@@ -40,7 +40,6 @@ Patch2:               %{name}-ecpg-includedir.patch
 Patch3:                %{name}-ac_version.patch
 Patch4:                %{name}-disable_horology_test.patch
 Patch5:                %{name}-pg_ctl-fix.patch
-Patch6:                %{name}-pg_perm_setlocale.patch
 URL:           http://www.postgresql.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -766,7 +765,6 @@ Różne moduły dołączone do PostgreSQL-a.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 tar xzf doc/man*.tar.gz
 
@@ -945,7 +943,7 @@ fi
 
 %files -f main-%{mver}.lang
 %defattr(644,root,root,755)
-%doc COPYRIGHT README HISTORY doc/{FAQ*,README*,bug.template}
+%doc COPYRIGHT README HISTORY doc/{README*,bug.template}
 %attr(754,root,root) /etc/rc.d/init.d/postgresql
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/postgresql
 
@@ -987,7 +985,7 @@ fi
 
 %files doc
 %defattr(644,root,root,755)
-%doc doc/unpacked/* doc/src/FAQ howto
+%doc doc/unpacked/* howto
 %{_examplesdir}/%{name}-%{version}
 
 %files libs -f libpq5-%{mver}.lang