- up to 12.4

- removed obsolete disable_horology_test (issue fixed upstream)

diff --git a/postgresql-disable_horology_test.patch b/postgresql-disable_horology_test.patch
deleted file mode 100644 (file)
index 636116e..0000000
--- a/postgresql-disable_horology_test.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# an ugly hack to disable some "horology" tests,which fail if built
-# --with-system-tzdata and non-US /usr/share/zoneinfo/posixrules:
-# http://www.nabble.com/Beta2-%22horology%22-test-failure-on-non-US-zoneinfo-posixrules-td13691442.html
-#
---- postgresql-8.3RC1/src/test/regress/expected/horology.out   2007-07-25 18:22:36.000000000 +0100
-+++ postgresql-8.3.0/src/test/regress/expected/horology.out    2008-02-04 20:20:16.091518646 +0000
-@@ -602,30 +602,12 @@
- 
- -- timestamp with time zone, interval arithmetic around DST change
- SET TIME ZONE 'CST7CDT';
--SELECT timestamp with time zone '2005-04-02 12:00-07' + interval '1 day' as "Apr 3, 12:00";
--         Apr 3, 12:00         
--------------------------------
-- Sun Apr 03 12:00:00 2005 CDT
--(1 row)
--
- SELECT timestamp with time zone '2005-04-02 12:00-07' + interval '24 hours' as "Apr 3, 13:00";
-          Apr 3, 13:00         
- ------------------------------
-  Sun Apr 03 13:00:00 2005 CDT
- (1 row)
- 
--SELECT timestamp with time zone '2005-04-03 12:00-06' - interval '1 day' as "Apr 2, 12:00";
--         Apr 2, 12:00         
--------------------------------
-- Sat Apr 02 12:00:00 2005 CST
--(1 row)
--
--SELECT timestamp with time zone '2005-04-03 12:00-06' - interval '24 hours' as "Apr 2, 11:00";
--         Apr 2, 11:00         
--------------------------------
-- Sat Apr 02 11:00:00 2005 CST
--(1 row)
--
- RESET TIME ZONE;
- SELECT timestamptz(date '1994-01-01', time '11:00') AS "Jan_01_1994_10am";
-        Jan_01_1994_10am       
---- postgresql-8.3RC1/src/test/regress/sql/horology.sql        2007-07-25 18:22:37.000000000 +0100
-+++ postgresql-8.3.0/src/test/regress/sql/horology.sql 2008-02-04 20:20:18.091381199 +0000
-@@ -114,10 +114,7 @@
- 
- -- timestamp with time zone, interval arithmetic around DST change
- SET TIME ZONE 'CST7CDT';
--SELECT timestamp with time zone '2005-04-02 12:00-07' + interval '1 day' as "Apr 3, 12:00";
- SELECT timestamp with time zone '2005-04-02 12:00-07' + interval '24 hours' as "Apr 3, 13:00";
--SELECT timestamp with time zone '2005-04-03 12:00-06' - interval '1 day' as "Apr 2, 12:00";
--SELECT timestamp with time zone '2005-04-03 12:00-06' - interval '24 hours' as "Apr 2, 11:00";
- RESET TIME ZONE;
- 
- 

diff --git a/postgresql.spec b/postgresql.spec
index 7a594402ce36515a287143052f458fb909a10ef6..d1c5c320c6f2e8f58b47ee959822f1e97175cd88 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -35,12 +35,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}.2
+Version:       %{mver}.4
 Release:       0.1
 License:       BSD
 Group:         Applications/Databases
 Source0:       http://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: a88ceea8ecf2741307f663e4539b58b7
+# Source0-md5: 80ebbf0e55193b123760e5f8e48c6cff
 Source1:       %{name}.init
 Source2:       pgsql-Database-HOWTO-html.tar.gz
 # Source2-md5: 5b656ddf1db41965761f85204a14398e
@@ -52,7 +52,6 @@ Patch0:               %{name}-conf.patch
 Patch1:                %{name}-absolute_dbpaths.patch
 Patch2:                %{name}-ecpg-includedir.patch
 
-Patch4:                %{name}-disable_horology_test.patch
 Patch5:                %{name}-heimdal.patch
 Patch6:                %{name}-link.patch
 URL:           http://www.postgresql.org/
@@ -791,7 +790,6 @@ Różne moduły dołączone do PostgreSQL-a.
 %{?with_absolute_dbpaths:%patch1 -p1}
 %patch2 -p1
 
-%patch4 -p1
 %patch5 -p1
 %patch6 -p1