- Sync spec file from postgresql17.
- Pull upstream patch to fix tests with timezone 2024b * postgresql-testsuite-timezone-fix.patch OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql12?expand=0&rev=107
This commit is contained in:
parent
b5bc7f0a98
commit
dd867a2851
594
postgresql-testsuite-timezone-fix.patch
Normal file
594
postgresql-testsuite-timezone-fix.patch
Normal file
@ -0,0 +1,594 @@
|
||||
From 205813da4c264d80db3c3215db199cc119e18369 Mon Sep 17 00:00:00 2001
|
||||
From: Tom Lane <tgl@sss.pgh.pa.us>
|
||||
Date: Sat, 14 Sep 2024 17:55:03 -0400
|
||||
Subject: [PATCH] Run regression tests with timezone America/Los_Angeles.
|
||||
|
||||
Historically we've used timezone "PST8PDT", but the recent release
|
||||
2024b of tzdb changes the definition of that zone in a way that
|
||||
breaks many test cases concerned with dates before 1970. Although
|
||||
we've not yet adopted 2024b into our own tree, this is already
|
||||
problematic for people using --with-system-tzdata if their platform
|
||||
has already adopted 2024b. To work with both older and newer
|
||||
versions of tzdb, switch to using "America/Los_Angeles", accepting
|
||||
the ensuing changes in regression test results.
|
||||
|
||||
Back-patch to all supported branches.
|
||||
|
||||
Per report and patch from Wolfgang Walther.
|
||||
|
||||
Discussion: https://postgr.es/m/0a997455-5aba-4cf2-a354-d26d8bcbfae6@technowledgy.de
|
||||
---
|
||||
doc/src/sgml/ref/set.sgml | 4 +-
|
||||
doc/src/sgml/regress.sgml | 6 +-
|
||||
src/test/regress/expected/date.out | 10 +-
|
||||
src/test/regress/expected/horology.out | 53 +++--
|
||||
src/test/regress/expected/timestamptz.out | 249 +++++++++++-----------
|
||||
src/test/regress/pg_regress.c | 2 +-
|
||||
src/test/regress/sql/horology.sql | 4 +-
|
||||
src/test/regress/sql/timestamptz.sql | 5 +-
|
||||
8 files changed, 178 insertions(+), 155 deletions(-)
|
||||
|
||||
diff --git a/src/test/regress/expected/date.out b/src/test/regress/expected/date.out
|
||||
index 4686d0d8cab46..7d753654f899d 100644
|
||||
--- a/src/test/regress/expected/date.out
|
||||
+++ b/src/test/regress/expected/date.out
|
||||
@@ -1148,7 +1148,7 @@ SELECT DATE_TRUNC('MILLENNIUM', TIMESTAMP '1970-03-20 04:30:00.00000'); -- 1001
|
||||
SELECT DATE_TRUNC('MILLENNIUM', DATE '1970-03-20'); -- 1001-01-01
|
||||
date_trunc
|
||||
------------------------------
|
||||
- Thu Jan 01 00:00:00 1001 PST
|
||||
+ Thu Jan 01 00:00:00 1001 LMT
|
||||
(1 row)
|
||||
|
||||
SELECT DATE_TRUNC('CENTURY', TIMESTAMP '1970-03-20 04:30:00.00000'); -- 1901
|
||||
@@ -1172,13 +1172,13 @@ SELECT DATE_TRUNC('CENTURY', DATE '2004-08-10'); -- 2001-01-01
|
||||
SELECT DATE_TRUNC('CENTURY', DATE '0002-02-04'); -- 0001-01-01
|
||||
date_trunc
|
||||
------------------------------
|
||||
- Mon Jan 01 00:00:00 0001 PST
|
||||
+ Mon Jan 01 00:00:00 0001 LMT
|
||||
(1 row)
|
||||
|
||||
SELECT DATE_TRUNC('CENTURY', DATE '0055-08-10 BC'); -- 0100-01-01 BC
|
||||
date_trunc
|
||||
---------------------------------
|
||||
- Tue Jan 01 00:00:00 0100 PST BC
|
||||
+ Tue Jan 01 00:00:00 0100 LMT BC
|
||||
(1 row)
|
||||
|
||||
SELECT DATE_TRUNC('DECADE', DATE '1993-12-25'); -- 1990-01-01
|
||||
@@ -1190,13 +1190,13 @@ SELECT DATE_TRUNC('DECADE', DATE '1993-12-25'); -- 1990-01-01
|
||||
SELECT DATE_TRUNC('DECADE', DATE '0004-12-25'); -- 0001-01-01 BC
|
||||
date_trunc
|
||||
---------------------------------
|
||||
- Sat Jan 01 00:00:00 0001 PST BC
|
||||
+ Sat Jan 01 00:00:00 0001 LMT BC
|
||||
(1 row)
|
||||
|
||||
SELECT DATE_TRUNC('DECADE', DATE '0002-12-31 BC'); -- 0011-01-01 BC
|
||||
date_trunc
|
||||
---------------------------------
|
||||
- Mon Jan 01 00:00:00 0011 PST BC
|
||||
+ Mon Jan 01 00:00:00 0011 LMT BC
|
||||
(1 row)
|
||||
|
||||
--
|
||||
diff --git a/src/test/regress/expected/horology.out b/src/test/regress/expected/horology.out
|
||||
index 058b009eeeba4..aae78fd7a867f 100644
|
||||
--- a/src/test/regress/expected/horology.out
|
||||
+++ b/src/test/regress/expected/horology.out
|
||||
@@ -1,7 +1,18 @@
|
||||
--
|
||||
-- HOROLOGY
|
||||
--
|
||||
-SET DateStyle = 'Postgres, MDY';
|
||||
+SHOW TimeZone; -- Many of these tests depend on the prevailing settings
|
||||
+ TimeZone
|
||||
+---------------------
|
||||
+ America/Los_Angeles
|
||||
+(1 row)
|
||||
+
|
||||
+SHOW DateStyle;
|
||||
+ DateStyle
|
||||
+---------------
|
||||
+ Postgres, MDY
|
||||
+(1 row)
|
||||
+
|
||||
--
|
||||
-- Test various input formats
|
||||
--
|
||||
@@ -759,12 +770,12 @@ SELECT '' AS "64", d1 + interval '1 year' AS one_year FROM TIMESTAMPTZ_TBL;
|
||||
| Sat Feb 14 17:32:01 1998 PST
|
||||
| Sun Feb 15 17:32:01 1998 PST
|
||||
| Mon Feb 16 17:32:01 1998 PST
|
||||
- | Thu Feb 16 17:32:01 0096 PST BC
|
||||
- | Sun Feb 16 17:32:01 0098 PST
|
||||
- | Fri Feb 16 17:32:01 0598 PST
|
||||
- | Wed Feb 16 17:32:01 1098 PST
|
||||
- | Sun Feb 16 17:32:01 1698 PST
|
||||
- | Fri Feb 16 17:32:01 1798 PST
|
||||
+ | Thu Feb 16 17:32:01 0096 LMT BC
|
||||
+ | Sun Feb 16 17:32:01 0098 LMT
|
||||
+ | Fri Feb 16 17:32:01 0598 LMT
|
||||
+ | Wed Feb 16 17:32:01 1098 LMT
|
||||
+ | Sun Feb 16 17:32:01 1698 LMT
|
||||
+ | Fri Feb 16 17:32:01 1798 LMT
|
||||
| Wed Feb 16 17:32:01 1898 PST
|
||||
| Mon Feb 16 17:32:01 1998 PST
|
||||
| Sun Feb 16 17:32:01 2098 PST
|
||||
@@ -830,12 +841,12 @@ SELECT '' AS "64", d1 - interval '1 year' AS one_year FROM TIMESTAMPTZ_TBL;
|
||||
| Wed Feb 14 17:32:01 1996 PST
|
||||
| Thu Feb 15 17:32:01 1996 PST
|
||||
| Fri Feb 16 17:32:01 1996 PST
|
||||
- | Mon Feb 16 17:32:01 0098 PST BC
|
||||
- | Thu Feb 16 17:32:01 0096 PST
|
||||
- | Tue Feb 16 17:32:01 0596 PST
|
||||
- | Sun Feb 16 17:32:01 1096 PST
|
||||
- | Thu Feb 16 17:32:01 1696 PST
|
||||
- | Tue Feb 16 17:32:01 1796 PST
|
||||
+ | Mon Feb 16 17:32:01 0098 LMT BC
|
||||
+ | Thu Feb 16 17:32:01 0096 LMT
|
||||
+ | Tue Feb 16 17:32:01 0596 LMT
|
||||
+ | Sun Feb 16 17:32:01 1096 LMT
|
||||
+ | Thu Feb 16 17:32:01 1696 LMT
|
||||
+ | Tue Feb 16 17:32:01 1796 LMT
|
||||
| Sun Feb 16 17:32:01 1896 PST
|
||||
| Fri Feb 16 17:32:01 1996 PST
|
||||
| Thu Feb 16 17:32:01 2096 PST
|
||||
@@ -2555,13 +2566,13 @@ RESET DateStyle;
|
||||
SELECT to_timestamp('0097/Feb/16 --> 08:14:30', 'YYYY/Mon/DD --> HH:MI:SS');
|
||||
to_timestamp
|
||||
------------------------------
|
||||
- Sat Feb 16 08:14:30 0097 PST
|
||||
+ Sat Feb 16 08:14:30 0097 LMT
|
||||
(1 row)
|
||||
|
||||
SELECT to_timestamp('97/2/16 8:14:30', 'FMYYYY/FMMM/FMDD FMHH:FMMI:FMSS');
|
||||
to_timestamp
|
||||
------------------------------
|
||||
- Sat Feb 16 08:14:30 0097 PST
|
||||
+ Sat Feb 16 08:14:30 0097 LMT
|
||||
(1 row)
|
||||
|
||||
SELECT to_timestamp('2011$03!18 23_38_15', 'YYYY-MM-DD HH24:MI:SS');
|
||||
@@ -2598,7 +2609,7 @@ SELECT to_timestamp('My birthday-> Year: 1976, Month: May, Day: 16',
|
||||
SELECT to_timestamp('1,582nd VIII 21', 'Y,YYYth FMRM DD');
|
||||
to_timestamp
|
||||
------------------------------
|
||||
- Sat Aug 21 00:00:00 1582 PST
|
||||
+ Sat Aug 21 00:00:00 1582 LMT
|
||||
(1 row)
|
||||
|
||||
SELECT to_timestamp('15 "text between quote marks" 98 54 45',
|
||||
@@ -2662,7 +2673,7 @@ SELECT to_timestamp('1997 AD 11 16', 'YYYY BC MM DD');
|
||||
SELECT to_timestamp('1997 BC 11 16', 'YYYY BC MM DD');
|
||||
to_timestamp
|
||||
---------------------------------
|
||||
- Tue Nov 16 00:00:00 1997 PST BC
|
||||
+ Tue Nov 16 00:00:00 1997 LMT BC
|
||||
(1 row)
|
||||
|
||||
SELECT to_timestamp('1997 A.D. 11 16', 'YYYY B.C. MM DD');
|
||||
@@ -2674,7 +2685,7 @@ SELECT to_timestamp('1997 A.D. 11 16', 'YYYY B.C. MM DD');
|
||||
SELECT to_timestamp('1997 B.C. 11 16', 'YYYY B.C. MM DD');
|
||||
to_timestamp
|
||||
---------------------------------
|
||||
- Tue Nov 16 00:00:00 1997 PST BC
|
||||
+ Tue Nov 16 00:00:00 1997 LMT BC
|
||||
(1 row)
|
||||
|
||||
SELECT to_timestamp('9-1116', 'Y-MMDD');
|
||||
@@ -2865,19 +2876,19 @@ SELECT to_date('-44-02-01 BC','YYYY-MM-DD BC');
|
||||
SELECT to_timestamp('44-02-01 11:12:13 BC','YYYY-MM-DD HH24:MI:SS BC');
|
||||
to_timestamp
|
||||
---------------------------------
|
||||
- Fri Feb 01 11:12:13 0044 PST BC
|
||||
+ Fri Feb 01 11:12:13 0044 LMT BC
|
||||
(1 row)
|
||||
|
||||
SELECT to_timestamp('-44-02-01 11:12:13','YYYY-MM-DD HH24:MI:SS');
|
||||
to_timestamp
|
||||
---------------------------------
|
||||
- Fri Feb 01 11:12:13 0044 PST BC
|
||||
+ Fri Feb 01 11:12:13 0044 LMT BC
|
||||
(1 row)
|
||||
|
||||
SELECT to_timestamp('-44-02-01 11:12:13 BC','YYYY-MM-DD HH24:MI:SS BC');
|
||||
to_timestamp
|
||||
------------------------------
|
||||
- Mon Feb 01 11:12:13 0044 PST
|
||||
+ Mon Feb 01 11:12:13 0044 LMT
|
||||
(1 row)
|
||||
|
||||
--
|
||||
diff --git a/src/test/regress/expected/timestamptz.out b/src/test/regress/expected/timestamptz.out
|
||||
index bc7879f288d1c..55efd18386881 100644
|
||||
--- a/src/test/regress/expected/timestamptz.out
|
||||
+++ b/src/test/regress/expected/timestamptz.out
|
||||
@@ -293,12 +293,12 @@ SELECT '' AS "64", d1 FROM TIMESTAMPTZ_TBL;
|
||||
| Fri Feb 14 17:32:01 1997 PST
|
||||
| Sat Feb 15 17:32:01 1997 PST
|
||||
| Sun Feb 16 17:32:01 1997 PST
|
||||
- | Tue Feb 16 17:32:01 0097 PST BC
|
||||
- | Sat Feb 16 17:32:01 0097 PST
|
||||
- | Thu Feb 16 17:32:01 0597 PST
|
||||
- | Tue Feb 16 17:32:01 1097 PST
|
||||
- | Sat Feb 16 17:32:01 1697 PST
|
||||
- | Thu Feb 16 17:32:01 1797 PST
|
||||
+ | Tue Feb 16 17:32:01 0097 LMT BC
|
||||
+ | Sat Feb 16 17:32:01 0097 LMT
|
||||
+ | Thu Feb 16 17:32:01 0597 LMT
|
||||
+ | Tue Feb 16 17:32:01 1097 LMT
|
||||
+ | Sat Feb 16 17:32:01 1697 LMT
|
||||
+ | Thu Feb 16 17:32:01 1797 LMT
|
||||
| Tue Feb 16 17:32:01 1897 PST
|
||||
| Sun Feb 16 17:32:01 1997 PST
|
||||
| Sat Feb 16 17:32:01 2097 PST
|
||||
@@ -322,19 +322,19 @@ SELECT '' AS "64", d1 FROM TIMESTAMPTZ_TBL;
|
||||
SELECT '4714-11-24 00:00:00+00 BC'::timestamptz;
|
||||
timestamptz
|
||||
---------------------------------
|
||||
- Sun Nov 23 16:00:00 4714 PST BC
|
||||
+ Sun Nov 23 16:07:02 4714 LMT BC
|
||||
(1 row)
|
||||
|
||||
SELECT '4714-11-23 16:00:00-08 BC'::timestamptz;
|
||||
timestamptz
|
||||
---------------------------------
|
||||
- Sun Nov 23 16:00:00 4714 PST BC
|
||||
+ Sun Nov 23 16:07:02 4714 LMT BC
|
||||
(1 row)
|
||||
|
||||
SELECT 'Sun Nov 23 16:00:00 4714 PST BC'::timestamptz;
|
||||
timestamptz
|
||||
---------------------------------
|
||||
- Sun Nov 23 16:00:00 4714 PST BC
|
||||
+ Sun Nov 23 16:07:02 4714 LMT BC
|
||||
(1 row)
|
||||
|
||||
SELECT '4714-11-23 23:59:59+00 BC'::timestamptz; -- out of range
|
||||
@@ -405,12 +405,12 @@ SELECT '' AS "15", d1 FROM TIMESTAMPTZ_TBL
|
||||
----+---------------------------------
|
||||
| -infinity
|
||||
| Wed Dec 31 16:00:00 1969 PST
|
||||
- | Tue Feb 16 17:32:01 0097 PST BC
|
||||
- | Sat Feb 16 17:32:01 0097 PST
|
||||
- | Thu Feb 16 17:32:01 0597 PST
|
||||
- | Tue Feb 16 17:32:01 1097 PST
|
||||
- | Sat Feb 16 17:32:01 1697 PST
|
||||
- | Thu Feb 16 17:32:01 1797 PST
|
||||
+ | Tue Feb 16 17:32:01 0097 LMT BC
|
||||
+ | Sat Feb 16 17:32:01 0097 LMT
|
||||
+ | Thu Feb 16 17:32:01 0597 LMT
|
||||
+ | Tue Feb 16 17:32:01 1097 LMT
|
||||
+ | Sat Feb 16 17:32:01 1697 LMT
|
||||
+ | Thu Feb 16 17:32:01 1797 LMT
|
||||
| Tue Feb 16 17:32:01 1897 PST
|
||||
| Wed Feb 28 17:32:01 1996 PST
|
||||
| Thu Feb 29 17:32:01 1996 PST
|
||||
@@ -473,12 +473,12 @@ SELECT '' AS "63", d1 FROM TIMESTAMPTZ_TBL
|
||||
| Fri Feb 14 17:32:01 1997 PST
|
||||
| Sat Feb 15 17:32:01 1997 PST
|
||||
| Sun Feb 16 17:32:01 1997 PST
|
||||
- | Tue Feb 16 17:32:01 0097 PST BC
|
||||
- | Sat Feb 16 17:32:01 0097 PST
|
||||
- | Thu Feb 16 17:32:01 0597 PST
|
||||
- | Tue Feb 16 17:32:01 1097 PST
|
||||
- | Sat Feb 16 17:32:01 1697 PST
|
||||
- | Thu Feb 16 17:32:01 1797 PST
|
||||
+ | Tue Feb 16 17:32:01 0097 LMT BC
|
||||
+ | Sat Feb 16 17:32:01 0097 LMT
|
||||
+ | Thu Feb 16 17:32:01 0597 LMT
|
||||
+ | Tue Feb 16 17:32:01 1097 LMT
|
||||
+ | Sat Feb 16 17:32:01 1697 LMT
|
||||
+ | Thu Feb 16 17:32:01 1797 LMT
|
||||
| Tue Feb 16 17:32:01 1897 PST
|
||||
| Sun Feb 16 17:32:01 1997 PST
|
||||
| Sat Feb 16 17:32:01 2097 PST
|
||||
@@ -505,12 +505,12 @@ SELECT '' AS "16", d1 FROM TIMESTAMPTZ_TBL
|
||||
| -infinity
|
||||
| Wed Dec 31 16:00:00 1969 PST
|
||||
| Thu Jan 02 00:00:00 1997 PST
|
||||
- | Tue Feb 16 17:32:01 0097 PST BC
|
||||
- | Sat Feb 16 17:32:01 0097 PST
|
||||
- | Thu Feb 16 17:32:01 0597 PST
|
||||
- | Tue Feb 16 17:32:01 1097 PST
|
||||
- | Sat Feb 16 17:32:01 1697 PST
|
||||
- | Thu Feb 16 17:32:01 1797 PST
|
||||
+ | Tue Feb 16 17:32:01 0097 LMT BC
|
||||
+ | Sat Feb 16 17:32:01 0097 LMT
|
||||
+ | Thu Feb 16 17:32:01 0597 LMT
|
||||
+ | Tue Feb 16 17:32:01 1097 LMT
|
||||
+ | Sat Feb 16 17:32:01 1697 LMT
|
||||
+ | Thu Feb 16 17:32:01 1797 LMT
|
||||
| Tue Feb 16 17:32:01 1897 PST
|
||||
| Wed Feb 28 17:32:01 1996 PST
|
||||
| Thu Feb 29 17:32:01 1996 PST
|
||||
@@ -778,12 +778,12 @@ SELECT d1 as timestamptz,
|
||||
Fri Feb 14 17:32:01 1997 PST | 1997 | 2 | 14 | 17 | 32 | 1
|
||||
Sat Feb 15 17:32:01 1997 PST | 1997 | 2 | 15 | 17 | 32 | 1
|
||||
Sun Feb 16 17:32:01 1997 PST | 1997 | 2 | 16 | 17 | 32 | 1
|
||||
- Tue Feb 16 17:32:01 0097 PST BC | -97 | 2 | 16 | 17 | 32 | 1
|
||||
- Sat Feb 16 17:32:01 0097 PST | 97 | 2 | 16 | 17 | 32 | 1
|
||||
- Thu Feb 16 17:32:01 0597 PST | 597 | 2 | 16 | 17 | 32 | 1
|
||||
- Tue Feb 16 17:32:01 1097 PST | 1097 | 2 | 16 | 17 | 32 | 1
|
||||
- Sat Feb 16 17:32:01 1697 PST | 1697 | 2 | 16 | 17 | 32 | 1
|
||||
- Thu Feb 16 17:32:01 1797 PST | 1797 | 2 | 16 | 17 | 32 | 1
|
||||
+ Tue Feb 16 17:32:01 0097 LMT BC | -97 | 2 | 16 | 17 | 32 | 1
|
||||
+ Sat Feb 16 17:32:01 0097 LMT | 97 | 2 | 16 | 17 | 32 | 1
|
||||
+ Thu Feb 16 17:32:01 0597 LMT | 597 | 2 | 16 | 17 | 32 | 1
|
||||
+ Tue Feb 16 17:32:01 1097 LMT | 1097 | 2 | 16 | 17 | 32 | 1
|
||||
+ Sat Feb 16 17:32:01 1697 LMT | 1697 | 2 | 16 | 17 | 32 | 1
|
||||
+ Thu Feb 16 17:32:01 1797 LMT | 1797 | 2 | 16 | 17 | 32 | 1
|
||||
Tue Feb 16 17:32:01 1897 PST | 1897 | 2 | 16 | 17 | 32 | 1
|
||||
Sun Feb 16 17:32:01 1997 PST | 1997 | 2 | 16 | 17 | 32 | 1
|
||||
Sat Feb 16 17:32:01 2097 PST | 2097 | 2 | 16 | 17 | 32 | 1
|
||||
@@ -852,12 +852,12 @@ SELECT d1 as timestamptz,
|
||||
Fri Feb 14 17:32:01 1997 PST | 1 | 1000 | 1000000
|
||||
Sat Feb 15 17:32:01 1997 PST | 1 | 1000 | 1000000
|
||||
Sun Feb 16 17:32:01 1997 PST | 1 | 1000 | 1000000
|
||||
- Tue Feb 16 17:32:01 0097 PST BC | 1 | 1000 | 1000000
|
||||
- Sat Feb 16 17:32:01 0097 PST | 1 | 1000 | 1000000
|
||||
- Thu Feb 16 17:32:01 0597 PST | 1 | 1000 | 1000000
|
||||
- Tue Feb 16 17:32:01 1097 PST | 1 | 1000 | 1000000
|
||||
- Sat Feb 16 17:32:01 1697 PST | 1 | 1000 | 1000000
|
||||
- Thu Feb 16 17:32:01 1797 PST | 1 | 1000 | 1000000
|
||||
+ Tue Feb 16 17:32:01 0097 LMT BC | 1 | 1000 | 1000000
|
||||
+ Sat Feb 16 17:32:01 0097 LMT | 1 | 1000 | 1000000
|
||||
+ Thu Feb 16 17:32:01 0597 LMT | 1 | 1000 | 1000000
|
||||
+ Tue Feb 16 17:32:01 1097 LMT | 1 | 1000 | 1000000
|
||||
+ Sat Feb 16 17:32:01 1697 LMT | 1 | 1000 | 1000000
|
||||
+ Thu Feb 16 17:32:01 1797 LMT | 1 | 1000 | 1000000
|
||||
Tue Feb 16 17:32:01 1897 PST | 1 | 1000 | 1000000
|
||||
Sun Feb 16 17:32:01 1997 PST | 1 | 1000 | 1000000
|
||||
Sat Feb 16 17:32:01 2097 PST | 1 | 1000 | 1000000
|
||||
@@ -927,12 +927,12 @@ SELECT d1 as timestamptz,
|
||||
Fri Feb 14 17:32:01 1997 PST | 1997 | 7 | 5 | 5 | 45
|
||||
Sat Feb 15 17:32:01 1997 PST | 1997 | 7 | 6 | 6 | 46
|
||||
Sun Feb 16 17:32:01 1997 PST | 1997 | 7 | 7 | 0 | 47
|
||||
- Tue Feb 16 17:32:01 0097 PST BC | -97 | 7 | 2 | 2 | 47
|
||||
- Sat Feb 16 17:32:01 0097 PST | 97 | 7 | 6 | 6 | 47
|
||||
- Thu Feb 16 17:32:01 0597 PST | 597 | 7 | 4 | 4 | 47
|
||||
- Tue Feb 16 17:32:01 1097 PST | 1097 | 7 | 2 | 2 | 47
|
||||
- Sat Feb 16 17:32:01 1697 PST | 1697 | 7 | 6 | 6 | 47
|
||||
- Thu Feb 16 17:32:01 1797 PST | 1797 | 7 | 4 | 4 | 47
|
||||
+ Tue Feb 16 17:32:01 0097 LMT BC | -97 | 7 | 2 | 2 | 47
|
||||
+ Sat Feb 16 17:32:01 0097 LMT | 97 | 7 | 6 | 6 | 47
|
||||
+ Thu Feb 16 17:32:01 0597 LMT | 597 | 7 | 4 | 4 | 47
|
||||
+ Tue Feb 16 17:32:01 1097 LMT | 1097 | 7 | 2 | 2 | 47
|
||||
+ Sat Feb 16 17:32:01 1697 LMT | 1697 | 7 | 6 | 6 | 47
|
||||
+ Thu Feb 16 17:32:01 1797 LMT | 1797 | 7 | 4 | 4 | 47
|
||||
Tue Feb 16 17:32:01 1897 PST | 1897 | 7 | 2 | 2 | 47
|
||||
Sun Feb 16 17:32:01 1997 PST | 1997 | 7 | 7 | 0 | 47
|
||||
Sat Feb 16 17:32:01 2097 PST | 2097 | 7 | 6 | 6 | 47
|
||||
@@ -1003,12 +1003,12 @@ SELECT d1 as timestamptz,
|
||||
Fri Feb 14 17:32:01 1997 PST | 199 | 20 | 2 | 2450495
|
||||
Sat Feb 15 17:32:01 1997 PST | 199 | 20 | 2 | 2450496
|
||||
Sun Feb 16 17:32:01 1997 PST | 199 | 20 | 2 | 2450497
|
||||
- Tue Feb 16 17:32:01 0097 PST BC | -10 | -1 | -1 | 1686043
|
||||
- Sat Feb 16 17:32:01 0097 PST | 9 | 1 | 1 | 1756537
|
||||
- Thu Feb 16 17:32:01 0597 PST | 59 | 6 | 1 | 1939158
|
||||
- Tue Feb 16 17:32:01 1097 PST | 109 | 11 | 2 | 2121779
|
||||
- Sat Feb 16 17:32:01 1697 PST | 169 | 17 | 2 | 2340925
|
||||
- Thu Feb 16 17:32:01 1797 PST | 179 | 18 | 2 | 2377449
|
||||
+ Tue Feb 16 17:32:01 0097 LMT BC | -10 | -1 | -1 | 1686043
|
||||
+ Sat Feb 16 17:32:01 0097 LMT | 9 | 1 | 1 | 1756537
|
||||
+ Thu Feb 16 17:32:01 0597 LMT | 59 | 6 | 1 | 1939158
|
||||
+ Tue Feb 16 17:32:01 1097 LMT | 109 | 11 | 2 | 2121779
|
||||
+ Sat Feb 16 17:32:01 1697 LMT | 169 | 17 | 2 | 2340925
|
||||
+ Thu Feb 16 17:32:01 1797 LMT | 179 | 18 | 2 | 2377449
|
||||
Tue Feb 16 17:32:01 1897 PST | 189 | 19 | 2 | 2413973
|
||||
Sun Feb 16 17:32:01 1997 PST | 199 | 20 | 2 | 2450497
|
||||
Sat Feb 16 17:32:01 2097 PST | 209 | 21 | 3 | 2487022
|
||||
@@ -1033,74 +1033,74 @@ SELECT d1 as timestamptz,
|
||||
date_part( 'timezone_hour', d1) AS timezone_hour,
|
||||
date_part( 'timezone_minute', d1) AS timezone_minute
|
||||
FROM TIMESTAMPTZ_TBL;
|
||||
- timestamptz | timezone | timezone_hour | timezone_minute
|
||||
----------------------------------+----------+---------------+-----------------
|
||||
- -infinity | | |
|
||||
- infinity | | |
|
||||
- Wed Dec 31 16:00:00 1969 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 17:32:02 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 17:32:01.4 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 17:32:01.5 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 17:32:01.6 1997 PST | -28800 | -8 | 0
|
||||
- Thu Jan 02 00:00:00 1997 PST | -28800 | -8 | 0
|
||||
- Thu Jan 02 03:04:05 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Tue Jun 10 17:32:01 1997 PDT | -25200 | -7 | 0
|
||||
- Sat Sep 22 18:19:20 2001 PDT | -25200 | -7 | 0
|
||||
- Wed Mar 15 08:14:01 2000 PST | -28800 | -8 | 0
|
||||
- Wed Mar 15 04:14:02 2000 PST | -28800 | -8 | 0
|
||||
- Wed Mar 15 02:14:03 2000 PST | -28800 | -8 | 0
|
||||
- Wed Mar 15 03:14:04 2000 PST | -28800 | -8 | 0
|
||||
- Wed Mar 15 01:14:05 2000 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 17:32:00 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 09:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 09:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 09:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Mon Feb 10 14:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Thu Jul 10 14:32:01 1997 PDT | -25200 | -7 | 0
|
||||
- Tue Jun 10 18:32:01 1997 PDT | -25200 | -7 | 0
|
||||
- Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Tue Feb 11 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Wed Feb 12 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Thu Feb 13 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Fri Feb 14 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Sat Feb 15 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Sun Feb 16 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Tue Feb 16 17:32:01 0097 PST BC | -28800 | -8 | 0
|
||||
- Sat Feb 16 17:32:01 0097 PST | -28800 | -8 | 0
|
||||
- Thu Feb 16 17:32:01 0597 PST | -28800 | -8 | 0
|
||||
- Tue Feb 16 17:32:01 1097 PST | -28800 | -8 | 0
|
||||
- Sat Feb 16 17:32:01 1697 PST | -28800 | -8 | 0
|
||||
- Thu Feb 16 17:32:01 1797 PST | -28800 | -8 | 0
|
||||
- Tue Feb 16 17:32:01 1897 PST | -28800 | -8 | 0
|
||||
- Sun Feb 16 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Sat Feb 16 17:32:01 2097 PST | -28800 | -8 | 0
|
||||
- Wed Feb 28 17:32:01 1996 PST | -28800 | -8 | 0
|
||||
- Thu Feb 29 17:32:01 1996 PST | -28800 | -8 | 0
|
||||
- Fri Mar 01 17:32:01 1996 PST | -28800 | -8 | 0
|
||||
- Mon Dec 30 17:32:01 1996 PST | -28800 | -8 | 0
|
||||
- Tue Dec 31 17:32:01 1996 PST | -28800 | -8 | 0
|
||||
- Wed Jan 01 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Fri Feb 28 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Sat Mar 01 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Tue Dec 30 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Wed Dec 31 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
- Fri Dec 31 17:32:01 1999 PST | -28800 | -8 | 0
|
||||
- Sat Jan 01 17:32:01 2000 PST | -28800 | -8 | 0
|
||||
- Sun Dec 31 17:32:01 2000 PST | -28800 | -8 | 0
|
||||
- Mon Jan 01 17:32:01 2001 PST | -28800 | -8 | 0
|
||||
+ timestamptz | timezone | timezone_hour | timezone_minute
|
||||
+---------------------------------+----------+---------------+--------------------
|
||||
+ -infinity | | |
|
||||
+ infinity | | |
|
||||
+ Wed Dec 31 16:00:00 1969 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 17:32:02 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 17:32:01.4 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 17:32:01.5 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 17:32:01.6 1997 PST | -28800 | -8 | 0
|
||||
+ Thu Jan 02 00:00:00 1997 PST | -28800 | -8 | 0
|
||||
+ Thu Jan 02 03:04:05 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Tue Jun 10 17:32:01 1997 PDT | -25200 | -7 | 0
|
||||
+ Sat Sep 22 18:19:20 2001 PDT | -25200 | -7 | 0
|
||||
+ Wed Mar 15 08:14:01 2000 PST | -28800 | -8 | 0
|
||||
+ Wed Mar 15 04:14:02 2000 PST | -28800 | -8 | 0
|
||||
+ Wed Mar 15 02:14:03 2000 PST | -28800 | -8 | 0
|
||||
+ Wed Mar 15 03:14:04 2000 PST | -28800 | -8 | 0
|
||||
+ Wed Mar 15 01:14:05 2000 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 17:32:00 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 09:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 09:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 09:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Mon Feb 10 14:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Thu Jul 10 14:32:01 1997 PDT | -25200 | -7 | 0
|
||||
+ Tue Jun 10 18:32:01 1997 PDT | -25200 | -7 | 0
|
||||
+ Mon Feb 10 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Tue Feb 11 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Wed Feb 12 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Thu Feb 13 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Fri Feb 14 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Sat Feb 15 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Sun Feb 16 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Tue Feb 16 17:32:01 0097 LMT BC | -28378 | -7 | -52.96666666666664
|
||||
+ Sat Feb 16 17:32:01 0097 LMT | -28378 | -7 | -52.96666666666664
|
||||
+ Thu Feb 16 17:32:01 0597 LMT | -28378 | -7 | -52.96666666666664
|
||||
+ Tue Feb 16 17:32:01 1097 LMT | -28378 | -7 | -52.96666666666664
|
||||
+ Sat Feb 16 17:32:01 1697 LMT | -28378 | -7 | -52.96666666666664
|
||||
+ Thu Feb 16 17:32:01 1797 LMT | -28378 | -7 | -52.96666666666664
|
||||
+ Tue Feb 16 17:32:01 1897 PST | -28800 | -8 | 0
|
||||
+ Sun Feb 16 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Sat Feb 16 17:32:01 2097 PST | -28800 | -8 | 0
|
||||
+ Wed Feb 28 17:32:01 1996 PST | -28800 | -8 | 0
|
||||
+ Thu Feb 29 17:32:01 1996 PST | -28800 | -8 | 0
|
||||
+ Fri Mar 01 17:32:01 1996 PST | -28800 | -8 | 0
|
||||
+ Mon Dec 30 17:32:01 1996 PST | -28800 | -8 | 0
|
||||
+ Tue Dec 31 17:32:01 1996 PST | -28800 | -8 | 0
|
||||
+ Wed Jan 01 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Fri Feb 28 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Sat Mar 01 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Tue Dec 30 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Wed Dec 31 17:32:01 1997 PST | -28800 | -8 | 0
|
||||
+ Fri Dec 31 17:32:01 1999 PST | -28800 | -8 | 0
|
||||
+ Sat Jan 01 17:32:01 2000 PST | -28800 | -8 | 0
|
||||
+ Sun Dec 31 17:32:01 2000 PST | -28800 | -8 | 0
|
||||
+ Mon Jan 01 17:32:01 2001 PST | -28800 | -8 | 0
|
||||
(66 rows)
|
||||
|
||||
-- TO_CHAR()
|
||||
@@ -1973,7 +1973,7 @@ INSERT INTO TIMESTAMPTZ_TST VALUES(4, '1000000312 23:58:48 IST');
|
||||
SELECT * FROM TIMESTAMPTZ_TST ORDER BY a;
|
||||
a | b
|
||||
---+--------------------------------
|
||||
- 1 | Wed Mar 12 13:58:48 1000 PST
|
||||
+ 1 | Wed Mar 12 14:05:50 1000 LMT
|
||||
2 | Sun Mar 12 14:58:48 10000 PDT
|
||||
3 | Sun Mar 12 14:58:48 100000 PDT
|
||||
3 | Sun Mar 12 14:58:48 10000 PDT
|
||||
@@ -2084,7 +2084,14 @@ SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'EDT');
|
||||
Wed Dec 10 09:10:10 2008 EST
|
||||
(1 row)
|
||||
|
||||
-SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'PST8PDT');
|
||||
+SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'FOO8BAR');
|
||||
+ make_timestamptz
|
||||
+------------------------------
|
||||
+ Wed Dec 10 13:10:10 2014 EST
|
||||
+(1 row)
|
||||
+
|
||||
+-- POSIX
|
||||
+SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'PST8PDT,M3.2.0,M11.1.0');
|
||||
make_timestamptz
|
||||
------------------------------
|
||||
Wed Dec 10 13:10:10 2014 EST
|
||||
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
|
||||
index 91f0d08ea0a8b..5fa18e2a34b35 100644
|
||||
--- a/src/test/regress/pg_regress.c
|
||||
+++ b/src/test/regress/pg_regress.c
|
||||
@@ -778,7 +778,7 @@ initialize_environment(void)
|
||||
/*
|
||||
* Set timezone and datestyle for datetime-related tests
|
||||
*/
|
||||
- putenv("PGTZ=PST8PDT");
|
||||
+ putenv("PGTZ=America/Los_Angeles");
|
||||
putenv("PGDATESTYLE=Postgres, MDY");
|
||||
|
||||
/*
|
||||
diff --git a/src/test/regress/sql/horology.sql b/src/test/regress/sql/horology.sql
|
||||
index b647f63c2bae4..94b7f31583d7a 100644
|
||||
--- a/src/test/regress/sql/horology.sql
|
||||
+++ b/src/test/regress/sql/horology.sql
|
||||
@@ -1,7 +1,9 @@
|
||||
--
|
||||
-- HOROLOGY
|
||||
--
|
||||
-SET DateStyle = 'Postgres, MDY';
|
||||
+
|
||||
+SHOW TimeZone; -- Many of these tests depend on the prevailing settings
|
||||
+SHOW DateStyle;
|
||||
|
||||
--
|
||||
-- Test various input formats
|
||||
diff --git a/src/test/regress/sql/timestamptz.sql b/src/test/regress/sql/timestamptz.sql
|
||||
index dd22c3296c854..b0536e79cd645 100644
|
||||
--- a/src/test/regress/sql/timestamptz.sql
|
||||
+++ b/src/test/regress/sql/timestamptz.sql
|
||||
@@ -330,7 +330,10 @@ SELECT make_timestamptz(1910, 12, 24, 0, 0, 0, 'Nehwon/Lankhmar');
|
||||
-- abbreviations
|
||||
SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'EST');
|
||||
SELECT make_timestamptz(2008, 12, 10, 10, 10, 10, 'EDT');
|
||||
-SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'PST8PDT');
|
||||
+SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'FOO8BAR');
|
||||
+
|
||||
+-- POSIX
|
||||
+SELECT make_timestamptz(2014, 12, 10, 10, 10, 10, 'PST8PDT,M3.2.0,M11.1.0');
|
||||
|
||||
RESET TimeZone;
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 5 14:02:55 UTC 2024 - Reinhard Max <max@suse.com>
|
||||
|
||||
- Sync spec file from postgresql17.
|
||||
- Pull upstream patch to fix tests with timezone 2024b
|
||||
* postgresql-testsuite-timezone-fix.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Aug 10 14:14:40 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
|
||||
|
||||
|
@ -20,8 +20,9 @@
|
||||
%define pgmajor 12
|
||||
%define buildlibs 0
|
||||
%define tarversion %{pgversion}
|
||||
%define oldest_supported_llvm_ver 7
|
||||
%define latest_supported_llvm_ver 17
|
||||
%define oldest_supported_llvm_ver 10
|
||||
# To be able to use cmake(LLVM) < ...
|
||||
%define latest_supported_llvm_ver_plus_one 19
|
||||
|
||||
### CUT HERE ###
|
||||
%define pgname postgresql%pgmajor
|
||||
@ -74,6 +75,12 @@ Name: %pgname
|
||||
%bcond_without libzstd
|
||||
%endif
|
||||
|
||||
%if %{without derived}
|
||||
BuildRequires: bison
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
BuildRequires: flex
|
||||
BuildRequires: perl
|
||||
%endif
|
||||
%if %mini
|
||||
%bcond_with selinux
|
||||
%if %pgmajor >= 16
|
||||
@ -95,12 +102,6 @@ BuildRequires: zlib-devel
|
||||
%if %{with liblz4}
|
||||
BuildRequires: pkgconfig(liblz4)
|
||||
%endif
|
||||
%if %{without derived}
|
||||
BuildRequires: bison
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
BuildRequires: flex
|
||||
BuildRequires: perl
|
||||
%endif
|
||||
|
||||
%if %{with libzstd}
|
||||
BuildRequires: pkgconfig(libzstd)
|
||||
@ -145,13 +146,8 @@ BuildRequires: libselinux-devel
|
||||
%endif
|
||||
%if %{with llvm}
|
||||
BuildRequires: gcc-c++
|
||||
%if 0%{?product_libs_llvm_ver} > %{latest_supported_llvm_ver}
|
||||
BuildRequires: clang%{latest_supported_llvm_ver}
|
||||
BuildRequires: llvm%{latest_supported_llvm_ver}-devel
|
||||
%else
|
||||
BuildRequires: clang
|
||||
BuildRequires: llvm-devel
|
||||
%endif
|
||||
BuildRequires: (cmake(Clang) >= %{oldest_supported_llvm_ver} with cmake(Clang) < %{latest_supported_llvm_ver_plus_one})
|
||||
BuildRequires: (cmake(LLVM) >= %{oldest_supported_llvm_ver} with cmake(LLVM) < %{latest_supported_llvm_ver_plus_one})
|
||||
%endif
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: openldap2-devel
|
||||
@ -194,6 +190,7 @@ Patch9: postgresql-var-run-socket.patch
|
||||
Patch10: postgresql-llvm-optional.patch
|
||||
Patch11: 0001-jit-Workaround-potential-datalayout-mismatch-on-s390.patch
|
||||
%endif
|
||||
Patch12: postgresql-testsuite-timezone-fix.patch
|
||||
URL: https://www.postgresql.org/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Provides: postgresql = %version-%release
|
||||
@ -528,6 +525,7 @@ touch -r configure tmp
|
||||
%patch -P 10
|
||||
%patch -P 11
|
||||
%endif
|
||||
%patch -P 12 -p 1
|
||||
touch -r tmp configure
|
||||
rm tmp
|
||||
find src/test/ -name '*.orig' -delete
|
||||
@ -611,6 +609,7 @@ VLANG=%pgmajor
|
||||
make DESTDIR=%buildroot PACKAGE_TARNAME=%pgname -C src/include install
|
||||
make DESTDIR=%buildroot PACKAGE_TARNAME=%pgname -C src/interfaces install
|
||||
rm -rf %buildroot%pgincludedir/server
|
||||
rm -rf %buildroot%pgdatadir
|
||||
%else
|
||||
make DESTDIR=%buildroot PACKAGE_TARNAME=%pgname install install-docs
|
||||
%if 0
|
||||
@ -773,8 +772,6 @@ done
|
||||
%endif
|
||||
popd
|
||||
|
||||
mkdir -p %buildroot%pgmandir/man1
|
||||
cp -a doc/src/sgml/man1/ecpg.1 %buildroot%pgmandir/man1/ecpg.1pg%pgmajor
|
||||
%find_lang ecpg-$VLANG devel.files
|
||||
# The devel subpackage is exclusive across versions
|
||||
# and not handled by update-alternatives.
|
||||
@ -792,8 +789,10 @@ cat server-devel.files >> devel.files
|
||||
# Build up the file lists for the libpq and libecpg packages
|
||||
cat > libpq.files <<EOF
|
||||
%defattr(-,root,root)
|
||||
%if !%mini
|
||||
%dir %pgdatadir
|
||||
%pgdatadir/pg_service.conf.sample
|
||||
%endif
|
||||
EOF
|
||||
find %buildroot -name 'libpq*.so.*' -printf '/%%P\n' >> libpq.files
|
||||
%find_lang libpq5-$VLANG libpq.files
|
||||
@ -979,12 +978,13 @@ fi
|
||||
%_libdir/pkgconfig/*
|
||||
%_libdir/lib*.so
|
||||
%pgincludedir
|
||||
|
||||
%if %{with server_devel}
|
||||
%exclude %pgincludedir/server
|
||||
%endif
|
||||
%doc %pgmandir/man1/ecpg.1*
|
||||
|
||||
%if !%mini
|
||||
%doc %pgmandir/man1/ecpg.1*
|
||||
%if %{with server_devel}
|
||||
%files server-devel -f server-devel.files
|
||||
%endif
|
||||
|
Loading…
Reference in New Issue
Block a user