up to 15.6 (fixes CVE-2024-0985)

[packages/postgresql.git] / postgresql.spec

diff --git a/postgresql.spec b/postgresql.spec
index 637fee50d9e576d790e49c51777595b364bef6d5..e7695dcef3367dce06000f613a3337376b69cd46 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -1,5 +1,4 @@
 # TODO:
-# - python 3 and python 2 subpackages?
 # - subpackage *_plperl and *_plpython contribs?
 # - think about pg_upgrade integration (sysconfig variable to allow upgrade from 8.3+ without dump/restore?)
 #   create postgresqlM.N packages with parts of old pgsql required by pg_upgrade
@@ -9,7 +8,7 @@
 %bcond_without tests                   # disable testing
 %bcond_without tcl                     # disable Tcl support
 %bcond_without kerberos5               # disable kerberos5 support
-%bcond_without llvm                    # disable llvm based JIT support
+%bcond_with    llvm                    # disable llvm based JIT support
 %bcond_without perl                    # disable Perl support
 %bcond_without python                  # disable Python support
 %bcond_with    bonjour                 # Bonjour/DNS_SD support
@@ -34,12 +33,12 @@ Summary(tr.UTF-8):  Veri Tabanı Yönetim Sistemi
 Summary(uk.UTF-8):     PostgreSQL - система керування базами даних
 Summary(zh_CN.UTF-8):  PostgreSQL 客户端程序和库文件
 Name:          postgresql
-Version:       %{mver}.3
+Version:       %{mver}.6
 Release:       1
 License:       BSD
 Group:         Applications/Databases
 Source0:       https://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 7cb75773ff8fbe533701562c3278206b
+# Source0-md5: 666511aeb53bd4ac029e236e35b42ca8
 Source1:       %{name}.init
 Source2:       pgsql-Database-HOWTO-html.tar.gz
 # Source2-md5: 5b656ddf1db41965761f85204a14398e
@@ -51,7 +50,6 @@ Patch0:               %{name}-conf.patch
 Patch1:                %{name}-absolute_dbpaths.patch
 Patch2:                %{name}-ecpg-includedir.patch
 Patch3:                ac.patch
-
 Patch5:                %{name}-heimdal.patch
 Patch6:                %{name}-link.patch
 URL:           https://www.postgresql.org/
@@ -84,11 +82,12 @@ BuildRequires:      perl-Scalar-List-Utils
 BuildRequires: perl-devel
 %endif
 %if %{with python}
-BuildRequires: python3 >= 1:2.4
-BuildRequires: python3-devel >= 1:2.4
-BuildRequires: python3-modules >= 1:2.4
+BuildRequires: python3 >= 1:3.2
+BuildRequires: python3-devel >= 1:3.2
+BuildRequires: python3-modules >= 1:3.2
 %endif
 BuildRequires: readline-devel >= 4.2
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.671
 %{?with_systemd:BuildRequires: systemd-devel >= 1:209}
 %{?with_systemtap:BuildRequires:       systemtap-sdt-devel}
@@ -480,6 +479,7 @@ C++, Perl и Tcl) разделены. Этот пакет включает то
 Summary:       Documentation for PostgreSQL
 Summary(pl.UTF-8):     Dodatkowa dokumantacja dla PostgreSQL
 Group:         Applications/Databases
+BuildArch:     noarch
 
 %description doc
 This package includes documentation and HOWTO for programmer, admin
@@ -622,7 +622,6 @@ Summary:    PL/Python - PostgreSQL procedural language
 Summary(pl.UTF-8):     PL/Python - język proceduralny bazy danych PostgreSQL
 Group:         Applications/Databases
 Requires:      %{name} = %{version}-%{release}
-%pyrequires_eq python
 
 %description module-plpython
 From PostgreSQL documentation:
@@ -802,7 +801,6 @@ Różne moduły dołączone do PostgreSQL-a.
 %{?with_absolute_dbpaths:%patch1 -p1}
 %patch2 -p1
 %patch3 -p1
-
 %patch5 -p1
 %patch6 -p1
 
@@ -900,11 +898,6 @@ install %{SOURCE6} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.target
 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}
-%endif
-
 # find locales
 for f in libpq5 pgscripts postgres psql initdb ecpg ecpglib6 \
        plpgsql %{?with_perl:plperl} %{?with_python:plpython} \