From a62f617e15ed86b9b84db0aa159c7f48d50cb865 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 30 Mar 2021 12:19:02 -0400
Subject: [PATCH] import postgresql-10.15-1.module+el8.3.0+8944+1ca16b1f

---
 .gitignore                              |  4 ++--
 .postgresql.metadata                    |  4 ++--
 SOURCES/postgresql-10.15.tar.bz2.sha256 |  1 +
 SOURCES/postgresql-10.6.tar.bz2.sha256  |  1 -
 SOURCES/postgresql-man.patch            | 12 ------------
 SPECS/postgresql.spec                   | 22 +++++++++++++++++++++-
 6 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 SOURCES/postgresql-10.15.tar.bz2.sha256
 delete mode 100644 SOURCES/postgresql-10.6.tar.bz2.sha256

diff --git a/.gitignore b/.gitignore
index 4705eb5..ef447a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-SOURCES/postgresql-10.6-US.pdf
-SOURCES/postgresql-10.6.tar.bz2
+SOURCES/postgresql-10.15-US.pdf
+SOURCES/postgresql-10.15.tar.bz2
 SOURCES/postgresql-9.2.24.tar.bz2
 SOURCES/postgresql-setup-8.2.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index 8296e79..f583f8c 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,4 +1,4 @@
-498591e271f9017f544ccb00778d0b27ad21d730 SOURCES/postgresql-10.6-US.pdf
-d3b460e9be7df545b55c994ff854cbb3f6381f28 SOURCES/postgresql-10.6.tar.bz2
+c979624349bbd2b0b7db13faf02b98c927119e3e SOURCES/postgresql-10.15-US.pdf
+3d688f05d2de7c9ed89ef6be8d33906a4e7a833d SOURCES/postgresql-10.15.tar.bz2
 63d6966ccdbab6aae1f9754fdb8e341ada1ef653 SOURCES/postgresql-9.2.24.tar.bz2
 c1f5190ed00adbcca38ec6f57c1452222450bb0e SOURCES/postgresql-setup-8.2.tar.gz
diff --git a/SOURCES/postgresql-10.15.tar.bz2.sha256 b/SOURCES/postgresql-10.15.tar.bz2.sha256
new file mode 100644
index 0000000..a59a1a2
--- /dev/null
+++ b/SOURCES/postgresql-10.15.tar.bz2.sha256
@@ -0,0 +1 @@
+5956bce0becffa77883c41594c95a23110b94f10cd66a1157e373c3575921f7e  postgresql-10.15.tar.bz2
diff --git a/SOURCES/postgresql-10.6.tar.bz2.sha256 b/SOURCES/postgresql-10.6.tar.bz2.sha256
deleted file mode 100644
index 9362476..0000000
--- a/SOURCES/postgresql-10.6.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-68a8276f08bda8fbefe562faaf8831cb20664a7a1d3ffdbbcc5b83e08637624b  postgresql-10.6.tar.bz2
diff --git a/SOURCES/postgresql-man.patch b/SOURCES/postgresql-man.patch
index 8d3afe3..d231f47 100644
--- a/SOURCES/postgresql-man.patch
+++ b/SOURCES/postgresql-man.patch
@@ -6,18 +6,6 @@ RHBZ#948933).
 diff -up ./doc/src/sgml/man1/ecpg.1.man948933 ./doc/src/sgml/man1/ecpg.1
 --- ./doc/src/sgml/man1/ecpg.1.man948933	2014-12-16 02:13:15.000000000 +0100
 +++ ./doc/src/sgml/man1/ecpg.1	2014-12-23 11:26:37.883644047 +0100
-@@ -80,6 +80,11 @@ INFORMIX_SE\&.
- Define a C preprocessor symbol\&.
- .RE
- .PP
-+\fB\-h \fR
-+.RS 4
-+Parse a header file, this option includes option \fB\-c\fR\&.
-+.RE
-+.PP
- \fB\-i\fR
- .RS 4
- Parse system include files as well\&.
 @@ -128,6 +133,11 @@ Allow question mark as placeholder for c
  .RE
  .RE
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index 78d80cd..b6aa694 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -58,7 +58,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 10
-Version: 10.6
+Version: %{majorversion}.15
 Release: 1%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -107,6 +107,7 @@ Patch5: postgresql-var-run-socket.patch
 Patch6: postgresql-man.patch
 Patch8: postgresql-no-libs.patch
 Patch9: postgresql-server-pg_config.patch
+# Patch10: postgresql-10.15-contrib-dblink-expected-out.patch
 
 BuildRequires: gcc
 BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
@@ -365,6 +366,7 @@ benchmarks.
 %patch6 -p1
 %patch8 -p1
 %patch9 -p1
+# %%patch10 -p1
 
 # We used to run autoconf here, but there's no longer any real need to,
 # since Postgres ships with a reasonably modern configure script.
@@ -1164,6 +1166,24 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Wed Nov 18 2020 Patrik Novotný <panovotn@redhat.com> - 10.15-1
+- Rebase to upstream release 10.15
+  Resolves: rhbz#1898213
+  Resolves: rhbz#1898341
+  Resolves: rhbz#1901567
+
+* Tue Aug 11 2020 Patrik Novotný <panovotn@redhat.com> - 10.14-1
+- Rebase to upstream release 10.14
+  Fixes RHBZ#1727803
+  Fixes RHBZ#1741489
+  Fixes RHBZ#1709196
+
+* Tue May 12 2020 Patrik Novotný <panovotn@redhat.com> - 10.13-1
+- Rebase to upstream release 10.13
+  Fixes RHBZ#1727803
+  Fixes RHBZ#1741489
+  Fixes RHBZ#1709196
+
 * Thu Nov 15 2018 Pavel Raiskup <praiskup@redhat.com> - 10.6-1
 - update to 10.6 per release notes:
   https://www.postgresql.org/docs/10/release-10-6.html