From 159e9411343fe8c2f027e1303b3248cc5bc87d50 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Wed, 17 Feb 2021 23:05:28 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/postgresql.git#bd3d5e9d0dcb9446a078d893f4aa3badf0316be8 --- postgresql.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/postgresql.spec b/postgresql.spec index 6801b26..5a571d1 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -34,7 +34,11 @@ %{!?test:%global test 1} %{!?llvmjit:%global llvmjit 1} %{!?upgrade:%global upgrade 1} +%if 0%{?rhel} > 8 +%{!?plpython:%global plpython 0} +%else %{!?plpython:%global plpython 1} +%endif %{!?plpython3:%global plpython3 1} %{!?pltcl:%global pltcl 1} %{!?plperl:%global plperl 1} @@ -61,7 +65,7 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 13 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. @@ -847,6 +851,8 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/pgsql/hstore_plperl.so %if !%plpython rm -f $RPM_BUILD_ROOT%{_bindir}/pgsql/hstore_plpython2.so +rm -f $RPM_BUILD_ROOT%{_datadir}/pgsql/extension/*_plpythonu* +rm -f $RPM_BUILD_ROOT%{_datadir}/pgsql/extension/*_plpython2u* %endif %if %nls @@ -1260,6 +1266,10 @@ make -C postgresql-setup-%{setup_version} check %changelog +* Wed Feb 17 2021 Honza Horak - 13.2-2 +- Do not build plpython on RHEL > 8 + Related: #1913681 + * Tue Feb 16 2021 Honza Horak - 13.2-1 - Update to 13.2