From 68dc12610f1ad088186caf3f5e8815fc4c1cb6c6986a800e817c5c83d48368b0 Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Tue, 5 Nov 2024 13:48:04 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/server:database:postgresql/postgresql15?expand=0&rev=58

---
 postgresql-testsuite-timezone-fix.patch | 41 -------------------------
 postgresql15.spec                       | 12 ++++----
 2 files changed, 6 insertions(+), 47 deletions(-)

diff --git a/postgresql-testsuite-timezone-fix.patch b/postgresql-testsuite-timezone-fix.patch
index aeaf1ea..f9a8ebc 100644
--- a/postgresql-testsuite-timezone-fix.patch
+++ b/postgresql-testsuite-timezone-fix.patch
@@ -28,47 +28,6 @@ Discussion: https://postgr.es/m/0a997455-5aba-4cf2-a354-d26d8bcbfae6@technowledg
  src/test/regress/sql/timestamptz.sql      |   5 +-
  8 files changed, 120 insertions(+), 105 deletions(-)
 
-diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml
-index 5459b29525969..f0e6047e0b117 100644
---- a/doc/src/sgml/ref/set.sgml
-+++ b/doc/src/sgml/ref/set.sgml
-@@ -200,7 +200,7 @@ SELECT setseed(<replaceable>value</replaceable>);
- 
-        <variablelist>
-         <varlistentry>
--         <term><literal>'PST8PDT'</literal></term>
-+         <term><literal>'America/Los_Angeles'</literal></term>
-          <listitem>
-           <para>
-            The time zone for Berkeley, California.
-@@ -298,7 +298,7 @@ SET datestyle TO postgres, dmy;
-   <para>
-    Set the time zone for Berkeley, California:
- <screen>
--SET TIME ZONE 'PST8PDT';
-+SET TIME ZONE 'America/Los_Angeles';
- </screen>
-   </para>
- 
-diff --git a/doc/src/sgml/regress.sgml b/doc/src/sgml/regress.sgml
-index ec50efa20a31f..aa380c20de67b 100644
---- a/doc/src/sgml/regress.sgml
-+++ b/doc/src/sgml/regress.sgml
-@@ -521,11 +521,11 @@ make check NO_LOCALE=1
-     <para>
-      Most of the date and time results are dependent on the time zone
-      environment.  The reference files are generated for time zone
--     <literal>PST8PDT</literal> (Berkeley, California), and there will be
-+     <literal>America/Los_Angeles</literal>, and there will be
-      apparent failures if the tests are not run with that time zone setting.
-      The regression test driver sets environment variable
--     <envar>PGTZ</envar> to <literal>PST8PDT</literal>, which normally
--     ensures proper results.
-+     <envar>PGTZ</envar> to <literal>America/Los_Angeles</literal>,
-+     which normally ensures proper results.
-     </para>
-    </sect2>
- 
 diff --git a/src/test/regress/expected/date.out b/src/test/regress/expected/date.out
 index 75ff65937895e..341123978ce06 100644
 --- a/src/test/regress/expected/date.out
diff --git a/postgresql15.spec b/postgresql15.spec
index bc5fe33..4ec1a54 100644
--- a/postgresql15.spec
+++ b/postgresql15.spec
@@ -75,12 +75,6 @@ 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
@@ -102,6 +96,12 @@ 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)