postgresql.spec

@@ -60,8 +60,8 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 12
-Version: %{majorversion}.7
+Version: %{majorversion}.2
-Release: 1%{?dist}
+Release: 2%{?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.
@@ -72,8 +72,8 @@ Url: http://www.postgresql.org/
 # in-place upgrade of an old database.  In most cases it will not be critical
 # that this be kept up with the latest minor release of the previous series;
 # but update when bugs affecting pg_dump output are fixed.
+%global prevversion 11.7
 %global prevmajorversion 11
-%global prevversion %{prevmajorversion}.12
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
@@ -106,6 +106,7 @@ Source17: https://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{pre
 Patch1: rpm-pgsql.patch
 Patch2: postgresql-logging.patch
 Patch5: postgresql-var-run-socket.patch
+Patch6: postgresql-man.patch
 Patch8: postgresql-external-libpq.patch
 Patch9: postgresql-server-pg_config.patch
 
@@ -120,7 +121,6 @@ BuildRequires: readline-devel zlib-devel
 BuildRequires: systemd systemd-devel util-linux
 BuildRequires: multilib-rpm-config
 BuildRequires: libpq-devel >= %version
-BuildRequires: docbook-style-xsl
 
 # postgresql-setup build requires
 BuildRequires: m4 elinks docbook-utils help2man
@@ -368,6 +368,11 @@ Requires:	llvm => 5.0
 %endif
 Provides:	postgresql-llvmjit >= %{version}-%{release}
 
+%ifarch ppc64 ppc64le
+AutoReq:	0
+Requires:	advance-toolchain-%{atstring}-runtime
+%endif
+
 BuildRequires:	llvm-devel >= 5.0 clang-devel >= 5.0
 
 %description llvmjit
@@ -389,6 +394,7 @@ goal of accelerating analytics queries.
 %patch1 -p1
 %patch2 -p1
 %patch5 -p1
+%patch6 -p1
 %patch8 -p1
 %patch9 -p1
 
@@ -408,10 +414,6 @@ find . -type f -name .gitignore | xargs rm
 
 
 %build
-# Avoid LTO on armv7hl as it runs out of memory
-%ifarch armv7hl s390x
-%define _lto_cflags %{nil}
-%endif
 # fail quickly and obviously if user tries to build as root
 %if %runselftest
 	if [ x"`id -u`" = x0 ]; then
@@ -533,8 +535,7 @@ cp src/Makefile.global src/Makefile.global.python3
 
 make distclean
 
-# endif plpython3
+%endif # %%plpython3
-%endif
 
 PYTHON=/usr/bin/python2
 
@@ -684,8 +685,7 @@ upgrade_configure ()
 	make %{?_smp_mflags} all
 	make -C contrib %{?_smp_mflags} all
 	popd
-# endif upgrade
+%endif # %%upgrade
-%endif
 
 
 %install
@@ -1258,55 +1258,6 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
-* Wed May 26 2021 Filip Januš <fjanus@redhat.com> - 12.7-1
-- Update to 12.7
-
-* Tue Feb 16 2021 Honza Horak <hhorak@redhat.com> - 12.6-1
-- Update to 12.6
-
-* Wed Jan 13 2021 Honza Horak <hhorak@redhat.com> - 12.5-1
-- Update to 12.5
-  Also fixes:
-    CVE-2020-14349
-    CVE-2020-14350
-    CVE-2020-25695
-    CVE-2020-25696
-    CVE-2020-25694
-
-* Fri Oct 09 2020 Honza Horak <hhorak@redhat.com> - 12.4-3
-- Removing problematic requirements on ppc64 arch
-  Resolves: #1882642
-
-* Fri Aug 21 2020 Jeff Law <law@redhat.com> - 12.4-2
-- Re-enable LTO
-
-* Tue Aug 18 2020 Patrik Novotný <panovotn@redhat.com> - 12.4-1
-- Rebase to upstream release 12.4
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 12.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 24 2020 Jeff Law <law@redhat.com> - 12.3-5
-- Disable LTO
-
-* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 12.3-4
-- Perl 5.32 rebuild
-
-* Sat Jun 06 2020 Pavel Raiskup <praiskup@redhat.com> - 12.3-3
-- add docbook-style-xsl to BuildRequires
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 12.3-2
-- Rebuilt for Python 3.9
-
-* Tue May 19 2020 Patrik Novotný <panovotn@redhat.com> - 12.3-2
-- Drop postgresql-man.patch
-
-* Mon May 18 2020 Patrik Novotný <panovotn@redhat.com> - 12.3-1
-- Rebase to upstream release 12.3
-
-* Fri May 15 2020 Pete Walter <pwalter@fedoraproject.org> - 12.2-3
-- Rebuild for ICU 67
-
 * Thu Mar 12 2020 Patrik Novotný <panovotn@redhat.com> - 12.2-2
 - Fix requirements for JIT in postgresql-server-devel
 - Fix build issues regarding new perl update

sources

@@ -1,6 +1,6 @@
-SHA512 (postgresql-11.12.tar.bz2) = 668914424e1dbe09a66d5272e5b0a17fa24c90d3d099f8161f1420eaa76675ea1c622e4d149bdfcb31f07af19602a500913cb97c49d717df23e374de09dc0274
+SHA512 (postgresql-12.2.tar.bz2) = 0e0ce8e21856e8f43e58b840c10c4e3ffae6d5207e0d778e9176e36f8e20e34633cbb06f0030a7c963c3491bb7e941456d91b55444c561cfc6f283fba76f33ee
-SHA512 (postgresql-11.12.tar.bz2.sha256) = d0dff7649b7274562ae4e6038175629ad95fecef510e669bf24b5452a1733745286d461d170ed66a2f0faeac3aae2df3e9b865db78c7652fe6c3db75380d4fc0
+SHA512 (postgresql-12.2.tar.bz2.sha256) = 8f94163228bb7d854d6fe4924a8a2ded00f90af662dd4a7c39b415be0826d9395e55f9b8e3b472baf7c19550e7c35198a650604a28756ad85d096bcfbaa5d1fd
-SHA512 (postgresql-12.7.tar.bz2) = 47ca347df63a441e52e52442074e85d0ebd3a89f7eb037022c4690cbe88b21a6a959092a812b79bb30db47b5975a5d7908318c73b2685683d48b4789d4ae6a44
+SHA512 (postgresql-12.2-US.pdf) = f086fead2c094e0f1148bcadaf13e240a84b53be289aa0a323295f65879699e81041b4bbc6cc3ce2744aac3fcb15083fa1cab583cd86fdc8ef626499e3cb3e71
-SHA512 (postgresql-12.7.tar.bz2.sha256) = ab5e6bad53b95d6c5fb9a9cc506ac41eea230f6869dff42d43a8af33d8b7239667b6f8f1974fe0cf92f1959720f8361b80ccd50666af01a1495cfa75e42af5d5
+SHA512 (postgresql-11.7.tar.bz2) = 32c7ace228f9895241ce0d925fbfc60c0cd39f4cd35368fb10dc7db046151ffd59a9895b4c30a529627f0103051e84b4992ed60312cccd292489f3037076ca1e
+SHA512 (postgresql-11.7.tar.bz2.sha256) = 1c8bc319da6bc49000f14e4636f4410b3eb52ab41b0698e7f3ee945efe8e93b6f1758e3f60d8658b0ea6836ea0f271a61031554a10e64c61d2c670e97c63812c
 SHA512 (postgresql-setup-8.4.tar.gz) = eb73767d5c676481598aeb545e15027a29a438aa29480ad414f6af31c9df61138a51f5425999b4b35e776a3dbbb28c887790ea9771abc3328158dd1d34b1dce1
-SHA512 (postgresql-12.7-US.pdf) = f6abaf9535d075b814743fd0676f06be3d72bf5d90bd6ee3b0fea9fa49ba2db1d5da7298bf7ac46b3e658ed7e6ff174230588b3c2782f98a9267db4fb18dcac2