From 6c5bd70240234fad63b1e4d0041128715ecb7721 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 10 May 2022 03:04:22 -0400
Subject: [PATCH] import postgresql-12.9-3.module+el8.6.0+13484+00387d81

---
 .gitignore                    |  2 +-
 .postgresql.metadata          |  2 +-
 SOURCES/postgresql.tmpfiles.d |  2 +-
 SPECS/postgresql.spec         | 19 ++++++++++++++++---
 4 files changed, 19 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 SPECS/postgresql.spec

diff --git a/.gitignore b/.gitignore
index 46f0f2f..08c0672 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 SOURCES/postgresql-10.17.tar.bz2
 SOURCES/postgresql-12.9-US.pdf
 SOURCES/postgresql-12.9.tar.bz2
-SOURCES/postgresql-setup-8.4.tar.gz
+SOURCES/postgresql-setup-8.6.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index 005f907..0a7e7a0 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,4 +1,4 @@
 479ec3bf2882a3188dd16ec92169c67e78995400 SOURCES/postgresql-10.17.tar.bz2
 5d4ff6d35b993626da2d4b98ea4224a9d6a8894a SOURCES/postgresql-12.9-US.pdf
 a79d8428850da50a65451e5e44771844c7f166d5 SOURCES/postgresql-12.9.tar.bz2
-f2112500abf4365fe968f1a7983fe174cca9e6f9 SOURCES/postgresql-setup-8.4.tar.gz
+9e12ee26bf41d3831f83049b51ae5da76de2ce12 SOURCES/postgresql-setup-8.6.tar.gz
diff --git a/SOURCES/postgresql.tmpfiles.d b/SOURCES/postgresql.tmpfiles.d
index d8d960d..6c48e34 100644
--- a/SOURCES/postgresql.tmpfiles.d
+++ b/SOURCES/postgresql.tmpfiles.d
@@ -1 +1 @@
-d /var/run/postgresql 0755 postgres postgres -
+d /run/postgresql 0755 postgres postgres -
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
old mode 100755
new mode 100644
index 62f9071..f0a1862
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 12
 Version: %{majorversion}.9
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
 # recognizes it as an independent license, so we do as well.
@@ -76,7 +76,7 @@ Url: http://www.postgresql.org/
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
-%global setup_version 8.4
+%global setup_version 8.6
 
 %global service_name postgresql.service
 
@@ -1088,6 +1088,7 @@ make -C postgresql-setup-%{setup_version} check
 %{_bindir}/pg_checksums
 %{_bindir}/postgres
 %{_bindir}/postgresql-setup
+%{_bindir}/postgresql-upgrade
 %{_bindir}/postmaster
 %dir %{_datadir}/pgsql
 %{_datadir}/pgsql/*.sample
@@ -1130,6 +1131,7 @@ make -C postgresql-setup-%{setup_version} check
 %{_mandir}/man1/postgres.*
 %{_mandir}/man1/postgresql-new-systemd-unit.*
 %{_mandir}/man1/postgresql-setup.*
+%{_mandir}/man1/postgresql-upgrade.*
 %{_mandir}/man1/postmaster.*
 %{_sbindir}/postgresql-new-systemd-unit
 %{_tmpfilesdir}/postgresql.conf
@@ -1223,9 +1225,20 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Tue Nov 30 2021 Filip Januš <fjanus@redhat.com> - 12.9-3
+- Add missing files from postgresql-setup v8.6
+- Realted: #1935301
+
+* Mon Nov 29 2021 Marek Kulik <mkulik@redhat.com> - 12.9-2
+- Update postgresql-setup to 8.6 (#1935301)
+
 * Mon Nov 15 2021 Filip Januš <fjanus@redhat.com> - 12.9-1
 - Update to 12.9
-- Resolves: #2024677
+- Resolves: #2007213
+
+* Fri Nov 05 2021 Filip Januš <fjanus@redhat.com> - 12.7-3
+- Using correct path to tmpfiles
+- Resolves: #2016991
 
 * Wed Jul 14 2021 Filip Januš <fjanus@redhat.com> - 12.7-2
 - Enable ssl for upgrade server