From 5d53f00e3922591ccda3e93777ab6aca5675ea85 Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Mon, 4 Apr 2022 18:35:54 +0200
Subject: [PATCH] - build with python3, allow newer autoconf, adjust for
 rpm.org

---
 postgresql-autoconf.patch | 14 ++++++++++++++
 postgresql.spec           | 24 +++++++++++++-----------
 2 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 postgresql-autoconf.patch

diff --git a/postgresql-autoconf.patch b/postgresql-autoconf.patch
new file mode 100644
index 0000000..29ef956
--- /dev/null
+++ b/postgresql-autoconf.patch
@@ -0,0 +1,14 @@
+diff -ur postgresql-10.20.orig/configure.in postgresql-10.20/configure.in
+--- postgresql-10.20.orig/configure.in	2022-02-07 22:21:57.000000000 +0100
++++ postgresql-10.20/configure.in	2022-04-04 18:29:38.565774510 +0200
+@@ -19,10 +19,6 @@
+ 
+ AC_INIT([PostgreSQL], [10.20], [pgsql-bugs@postgresql.org])
+ 
+-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
+-Untested combinations of 'autoconf' and PostgreSQL versions are not
+-recommended.  You can remove the check from 'configure.in' but it is then
+-your responsibility whether the result works or not.])])
+ AC_COPYRIGHT([Copyright (c) 1996-2017, PostgreSQL Global Development Group])
+ AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
+ AC_CONFIG_AUX_DIR(config)
diff --git a/postgresql.spec b/postgresql.spec
index 74c7e4b..8835dee 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -29,7 +29,7 @@ Summary(uk.UTF-8):	PostgreSQL - система керування базами 
 Summary(zh_CN.UTF-8):	PostgreSQL 客户端程序和库文件
 Name:		postgresql-%{pgsqlversion}
 Version:	%{pgsqlversion}.20
-Release:	1
+Release:	2
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
@@ -46,6 +46,7 @@ Patch4:		postgresql-tests.patch
 Patch5:		postgresql-heimdal.patch
 Patch6:		postgresql-link.patch
 Patch7:		socket-dir-fixes.patch
+Patch8:		postgresql-autoconf.patch
 URL:		http://www.postgresql.org/
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake
@@ -71,9 +72,9 @@ BuildRequires:	ossp-uuid-devel
 BuildRequires:	pam-devel
 %{?with_perl:BuildRequires:	perl-devel}
 %if %{with python}
-BuildRequires:	python >= 1:2.3
-BuildRequires:	python-devel >= 1:2.3
-BuildRequires:	python-modules >= 1:2.3
+BuildRequires:	python3
+BuildRequires:	python3-devel
+BuildRequires:	python3-modules
 %endif
 BuildRequires:	readline-devel >= 4.2
 BuildRequires:	rpmbuild(macros) >= 1.671
@@ -84,8 +85,8 @@ BuildRequires:	zlib-devel
 Requires(post,preun):	/sbin/chkconfig
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
-Requires(triggerpostun):	/bin/id
-Requires(triggerpostun):	/usr/sbin/usermod
+Requires(post):	/bin/id
+Requires(post):	/usr/sbin/usermod
 Requires:	%{name}-clients = %{version}-%{release}
 Requires:	%{name}-dirs = %{version}-%{release}
 Requires:	postgresql-libs >= %{version}-%{release}
@@ -488,6 +489,7 @@ Różne moduły dołączone do PostgreSQL-a.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 # force rebuild of bison/flex files
 find src -name \*.l -o -name \*.y | xargs touch
@@ -578,8 +580,8 @@ install -d howto
 tar zxf %{SOURCE2} -C howto
 
 %if %{with python}
-%py_comp $RPM_BUILD_ROOT%{py_libdir}
-%py_ocomp $RPM_BUILD_ROOT%{py_libdir}
+%py3_comp $RPM_BUILD_ROOT%{py3_libdir}
+%py3_ocomp $RPM_BUILD_ROOT%{py3_libdir}
 %endif
 
 # find locales
@@ -873,7 +875,7 @@ fi
 %if %{with python}
 %files module-plpython -f plpython-%{pgsqlversion}.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{moduledir}/plpython2.so
+%attr(755,root,root) %{moduledir}/plpython3.so
 %{extensiondir}/plpython*--*.sql
 %{extensiondir}/plpython*.control
 %endif
@@ -1043,8 +1045,8 @@ fi
 %{extensiondir}/hstore_plperlu.control
 %endif
 %if %{with python}
-%attr(755,root,root) %{moduledir}/hstore_plpython2.so
-%attr(755,root,root) %{moduledir}/ltree_plpython2.so
+%attr(755,root,root) %{moduledir}/hstore_plpython3.so
+%attr(755,root,root) %{moduledir}/ltree_plpython3.so
 %{extensiondir}/hstore_plpythonu--*.sql
 %{extensiondir}/hstore_plpythonu.control
 %{extensiondir}/hstore_plpython2u--*.sql
-- 
2.46.0