X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=postgresql.spec;h=07091706ad3a9d8513a21360e35c2686c6d025a4;hb=HEAD;hp=d535a5a2a422620cf0b6ab9015dcc4f42afd64d0;hpb=e91dafec9b0903bad6593b54c939b8dde755b243;p=packages%2Fpostgresql.git

diff --git a/postgresql.spec b/postgresql.spec
index d535a5a..eb0ed81 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -2,7 +2,7 @@
 # Conditional build:
 %bcond_without	tests			# disable testing
 %bcond_without	tcl			# disable Tcl support
-%bcond_without	kerberos5		# disable kerberos5 support
+%bcond_with	kerberos5		# disable kerberos5 support
 %bcond_without	perl			# disable Perl support
 %bcond_without	python			# disable Python support
 %bcond_with	bonjour			# Bonjour/DNS_SD support
@@ -14,8 +14,8 @@
 #
 
 %define beta %{nil}
-%define pgsqlversion 14
-%define pgsqlpriority 140
+%define pgsqlversion 16
+%define pgsqlpriority 160
 
 Summary:	PostgreSQL Data Base Management System
 Summary(de.UTF-8):	PostgreSQL Datenbankverwaltungssystem
@@ -28,12 +28,12 @@ Summary(tr.UTF-8):	Veri Tabanı Yönetim Sistemi
 Summary(uk.UTF-8):	PostgreSQL - система керування базами даних
 Summary(zh_CN.UTF-8):	PostgreSQL 客户端程序和库文件
 Name:		postgresql-%{pgsqlversion}
-Version:	%{pgsqlversion}.0
+Version:	%{pgsqlversion}.2
 Release:	1
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
-# Source0-md5:	26e85a23c6a0ef68e9755555aea31141
+# Source0-md5:	3d19d93434666db5d33e692472915ae5
 Source1:	postgresql.init
 Source2:	pgsql-Database-HOWTO-html.tar.gz
 # Source2-md5:	5b656ddf1db41965761f85204a14398e
@@ -47,6 +47,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
@@ -72,9 +73,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
@@ -85,8 +86,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}
@@ -109,7 +110,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # omitted contribs:
 # spi, test_decoding, worker_spi - examples/tests
 # tsearch2 - old module for compatibility only
-%define	contrib_modules	adminpack amcheck auth_delay auto_explain bloom %{?with_perl:bool_plperl} btree_gin btree_gist citext cube dblink dict_int dict_xsyn earthdistance file_fdw fuzzystrmatch hstore %{?with_perl:hstore_plperl} %{?with_python:hstore_plpython} intagg intarray isn %{?with_perl:jsonb_plperl} %{?with_python:jsonb_plpython} lo ltree %{?with_python:ltree_plpython} oid2name old_snapshot pageinspect passwordcheck pg_buffercache pg_freespacemap pg_prewarm pg_stat_statements pg_surgery pg_trgm pg_visibility pgcrypto pgrowlocks pgstattuple postgres_fdw seg %{?with_selinux:sepgsql} spi sslinfo tablefunc tcn tsm_system_rows tsm_system_time unaccent uuid-ossp vacuumlo xml2
+%define	contrib_modules	adminpack amcheck auth_delay auto_explain basebackup_to_shell basic_archive bloom %{?with_perl:bool_plperl} btree_gin btree_gist citext cube dblink dict_int dict_xsyn earthdistance file_fdw fuzzystrmatch hstore %{?with_perl:hstore_plperl} %{?with_python:hstore_plpython} intagg intarray isn %{?with_perl:jsonb_plperl} %{?with_python:jsonb_plpython} lo ltree %{?with_python:ltree_plpython} oid2name old_snapshot pageinspect passwordcheck pg_buffercache pg_freespacemap pg_prewarm pg_stat_statements pg_surgery pg_trgm pg_visibility pg_walinspect pgcrypto pgrowlocks pgstattuple postgres_fdw seg %{?with_selinux:sepgsql} spi sslinfo tablefunc tcn tsm_system_rows tsm_system_time unaccent uuid-ossp vacuumlo xml2
 
 %description
 PostgreSQL Data Base Management System (formerly known as Postgres,
@@ -405,7 +406,7 @@ 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
+%pyrequires_eq	python3
 Obsoletes:	postgresql-module-plpython
 
 %description module-plpython
@@ -599,6 +600,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
@@ -690,8 +692,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
@@ -724,6 +726,7 @@ cp -p src/pl/plperl/ppport.h $RPM_BUILD_ROOT%{_includedir}/postgresql/%{pgsqlver
 
 # package it...?  nah, why bother.
 %{__rm} -r $RPM_BUILD_ROOT%{pgsqldatadir}/doc/html
+%{__rm} -r $RPM_BUILD_ROOT%{pgsqldatadir}/doc/extension/*.example
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -878,7 +881,6 @@ fi
 %attr(755,root,root) %{pgsqllibdir}/bin/pg_waldump
 %attr(755,root,root) %{pgsqllibdir}/bin/pgbench
 %attr(755,root,root) %{pgsqllibdir}/bin/postgres
-%attr(755,root,root) %{pgsqllibdir}/bin/postmaster
 
 %attr(755,root,root) %{moduledir}/cyrillic_and_mic.so
 %attr(755,root,root) %{moduledir}/dict_int.so
@@ -922,7 +924,6 @@ fi
 %{pgsqldatadir}/man/man1/pg_upgrade.1*
 %{pgsqldatadir}/man/man1/pgbench.1*
 %{pgsqldatadir}/man/man1/postgres.1*
-%{pgsqldatadir}/man/man1/postmaster.1*
 
 %files -n postgresql-common
 %defattr(644,root,root,755)
@@ -999,6 +1000,7 @@ fi
 %{_includedir}/postgres_ext.h
 %dir %{_includedir}/postgresql/internal
 %{_includedir}/postgresql/internal/c.h
+%{_includedir}/postgresql/internal/fe-auth-sasl.h
 %{_includedir}/postgresql/internal/libpq-int.h
 %{_includedir}/postgresql/internal/port.h
 %{_includedir}/postgresql/internal/postgres_fe.h
@@ -1070,7 +1072,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
@@ -1129,8 +1131,7 @@ fi
 
 %files contrib
 %defattr(644,root,root,755)
-%doc contrib/README
-%doc %{pgsqldatadir}/doc/extension/*.example
+%doc contrib/README contrib/spi/*.example
 %attr(755,root,root) %{pgsqllibdir}/bin/oid2name
 %attr(755,root,root) %{pgsqllibdir}/bin/vacuumlo
 %attr(755,root,root) %{moduledir}/_int.so
@@ -1139,6 +1140,8 @@ fi
 %attr(755,root,root) %{moduledir}/auth_delay.so
 %attr(755,root,root) %{moduledir}/auto_explain.so
 %attr(755,root,root) %{moduledir}/autoinc.so
+%attr(755,root,root) %{moduledir}/basebackup_to_shell.so
+%attr(755,root,root) %{moduledir}/basic_archive.so
 %attr(755,root,root) %{moduledir}/bloom.so
 %attr(755,root,root) %{moduledir}/btree_gin.so
 %attr(755,root,root) %{moduledir}/btree_gist.so
@@ -1161,6 +1164,7 @@ fi
 %attr(755,root,root) %{moduledir}/pg_stat_statements.so
 %attr(755,root,root) %{moduledir}/pg_surgery.so
 %attr(755,root,root) %{moduledir}/pg_visibility.so
+%attr(755,root,root) %{moduledir}/pg_walinspect.so
 %attr(755,root,root) %{moduledir}/pgrowlocks.so
 %attr(755,root,root) %{moduledir}/pgstattuple.so
 %attr(755,root,root) %{moduledir}/postgres_fdw.so
@@ -1228,6 +1232,8 @@ fi
 %{extensiondir}/pg_surgery.control
 %{extensiondir}/pg_visibility--*.sql
 %{extensiondir}/pg_visibility.control
+%{extensiondir}/pg_walinspect--*.sql
+%{extensiondir}/pg_walinspect.control
 %{extensiondir}/pgrowlocks--*.sql
 %{extensiondir}/pgrowlocks.control
 %{extensiondir}/pgstattuple--*.sql
@@ -1268,25 +1274,13 @@ fi
 %{extensiondir}/jsonb_plperlu.control
 %endif
 %if %{with python}
-%attr(755,root,root) %{moduledir}/hstore_plpython2.so
-%attr(755,root,root) %{moduledir}/jsonb_plpython2.so
-%attr(755,root,root) %{moduledir}/ltree_plpython2.so
-%{extensiondir}/hstore_plpythonu--*.sql
-%{extensiondir}/hstore_plpythonu.control
-%{extensiondir}/hstore_plpython2u--*.sql
-%{extensiondir}/hstore_plpython2u.control
+%attr(755,root,root) %{moduledir}/hstore_plpython3.so
+%attr(755,root,root) %{moduledir}/jsonb_plpython3.so
+%attr(755,root,root) %{moduledir}/ltree_plpython3.so
 %{extensiondir}/hstore_plpython3u--*.sql
 %{extensiondir}/hstore_plpython3u.control
-%{extensiondir}/jsonb_plpythonu--*.sql
-%{extensiondir}/jsonb_plpythonu.control
-%{extensiondir}/jsonb_plpython2u--*.sql
-%{extensiondir}/jsonb_plpython2u.control
 %{extensiondir}/jsonb_plpython3u--*.sql
 %{extensiondir}/jsonb_plpython3u.control
-%{extensiondir}/ltree_plpythonu--*.sql
-%{extensiondir}/ltree_plpythonu.control
-%{extensiondir}/ltree_plpython2u--*.sql
-%{extensiondir}/ltree_plpython2u.control
 %{extensiondir}/ltree_plpython3u--*.sql
 %{extensiondir}/ltree_plpython3u.control
 %endif