From 320d031224b7cf7b2e465511aa602ff0d3335be9 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 16 2020 11:46:38 +0000
Subject: import rh-postgresql12-postgresql-12.4-1.el7


---

diff --git a/.gitignore b/.gitignore
index a60e663..3d3efcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/postgresql-12.1-US.pdf
-SOURCES/postgresql-12.1.tar.bz2
+SOURCES/postgresql-12.4-US.pdf
+SOURCES/postgresql-12.4.tar.bz2
 SOURCES/postgresql-setup-8.4.tar.gz
diff --git a/.rh-postgresql12-postgresql.metadata b/.rh-postgresql12-postgresql.metadata
index b40539f..f183fe7 100644
--- a/.rh-postgresql12-postgresql.metadata
+++ b/.rh-postgresql12-postgresql.metadata
@@ -1,3 +1,3 @@
-e20c4ef3caebd2f6aa1d4ad448eaba6f786baf26 SOURCES/postgresql-12.1-US.pdf
-b9bd13230fa02a4d0105e92d15d56e7842119e26 SOURCES/postgresql-12.1.tar.bz2
+28a5665b69d13ad426d903bcb93fe28be735da7f SOURCES/postgresql-12.4-US.pdf
+5a64e3916a42547227f2afec359d1c9ddc3eba8e SOURCES/postgresql-12.4.tar.bz2
 f2112500abf4365fe968f1a7983fe174cca9e6f9 SOURCES/postgresql-setup-8.4.tar.gz
diff --git a/SOURCES/postgresql-12.1.tar.bz2.sha256 b/SOURCES/postgresql-12.1.tar.bz2.sha256
deleted file mode 100644
index 27f8f97..0000000
--- a/SOURCES/postgresql-12.1.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-a09bf3abbaf6763980d0f8acbb943b7629a8b20073de18d867aecdb7988483ed  postgresql-12.1.tar.bz2
diff --git a/SOURCES/postgresql-12.4.tar.bz2.sha256 b/SOURCES/postgresql-12.4.tar.bz2.sha256
new file mode 100644
index 0000000..1a4f61b
--- /dev/null
+++ b/SOURCES/postgresql-12.4.tar.bz2.sha256
@@ -0,0 +1 @@
+bee93fbe2c32f59419cb162bcc0145c58da9a8644ee154a30b9a5ce47de606cc  postgresql-12.4.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 d00290e..c89958a 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -71,8 +71,8 @@
 Summary: PostgreSQL client programs
 Name: %{?scl_prefix}postgresql
 %global majorversion 12
-Version: %{majorversion}.1
-Release: 2%{?dist}
+Version: %{majorversion}.4
+Release: 1%{?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.
@@ -1191,6 +1191,10 @@ make -C postgresql-setup-%{setup_version} check
 %endif
 
 %changelog
+* Tue Sep 08 2020 Patrik Novotný <panovotn@redhat.com> - 12.4-1
+- Rebase to upstream release 12.4
+  https://www.postgresql.org/docs/12/release-12-4.html
+ 
 * Thu Nov 14 2019 Patrik Novotný <panovotn@redhat.com> - 12.1-2
 - Fix requires exclude