- partial PLD merge

diff --git a/postgresql.spec b/postgresql.spec
index 346803c341229cc62cad29f97f905cf0873cd54a..4f8a77d1356829cd29d7e25eb62b942c73585b0f 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -8,6 +8,9 @@
 %bcond_with    bonjour                 # Bonjour/DNS_SD support
 %bcond_without ldap                    # disable LDAP support
 %bcond_without selinux                 # sepgsql contrib module
+%bcond_without curl                    # curl support (OAuth)
+%bcond_without io_uring                # io_uring support
+%bcond_without numa                    # NUMA support
 %bcond_with    systemtap               # systemtap/dtrace probes
 %bcond_with    absolute_dbpaths        # enable absolute paths to create database
                                        # (disabled by default because it is a security risk)
@@ -54,6 +57,7 @@ BuildRequires:        automake
 %{?with_bonjour:BuildRequires: avahi-compat-libdns_sd-devel}
 # not needed for releases... but fixes something in snapshot
 BuildRequires: bison >= 1.875
+%{?with_curl:BuildRequires:    curl-devel >= 7.61.0}
 BuildRequires: docbook-dtd42-sgml
 BuildRequires: docbook-dtd42-xml
 BuildRequires: docbook-style-xsl
@@ -63,10 +67,12 @@ BuildRequires:      gnome-doc-tools
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
 %{?with_selinux:BuildRequires: libselinux-devel >= 2.1.10}
 BuildRequires: libtool
+%{?with_io_uring:BuildRequires:        liburing-devel >= 2.5}
 BuildRequires: libxml2-devel >= 1:2.6.23
 BuildRequires: libxslt-devel
 BuildRequires: libxslt-progs
 BuildRequires: ncurses-devel >= 5.0
+%{?with_numa:BuildRequires:    numactl-devel}
 %{?with_ldap:BuildRequires:    openldap-devel}
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: ossp-uuid-devel
@@ -91,6 +97,7 @@ Requires(post):       /usr/sbin/usermod
 Requires:      %{name}-clients = %{version}-%{release}
 Requires:      %{name}-dirs = %{version}-%{release}
 Requires:      postgresql-libs >= %{version}-%{release}
+%{?with_io_uring:Requires:     liburing >= 2.5}
 Requires:      rc-scripts >= 0.4.3.0
 Requires:      tzdata
 Obsoletes:     postgresql
@@ -287,6 +294,7 @@ Summary(pt_BR.UTF-8):       Biblioteca compartilhada do PostgreSQL
 Summary(zh_CN.UTF-8):  PostgreSQL 客户所需要的共享库
 Group:         Libraries
 Requires:      postgresql-common >= %{version}-%{release}
+%{?with_curl:Suggests: %{name}-oauth = %{version}-%{release}}
 
 %description -n postgresql-libs
 PostgreSQL shared libraries.
@@ -579,6 +587,19 @@ Moduł z funkcjami XML zapewniającymi obsługę zapytań XPath oraz
 funkcjonalność XSLT. Jest także nowa funkcja tabelowa pozwalająca na
 bezpośrednie zwracanie wielu wyników XML.
 
+%package oauth
+Summary:       OAuth 2.0 authentication support
+Summary(pl.UTF-8):     Wsparcie dla uwierzytelnienia OAuth 2.0
+Group:         Applications/Databases
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      curl-libs >= 7.61.0
+
+%description oauth
+OAuth 2.0 authentication support.
+
+%description oauth -l pl.UTF-8
+Wsparcie dla uwierzytelnienia OAuth 2.0.
+
 %package contrib
 Summary:       Miscellaneous PostgreSQL contrib modules
 Summary(pl.UTF-8):     Różne moduły dołączone do PostgreSQL-a
@@ -630,10 +651,12 @@ find src -name \*.l -o -name \*.y | xargs touch
        %{?with_systemtap:--enable-dtrace} \
        --enable-integer-datetimes \
        --enable-nls \
-       --enable-thread-safety \
        %{?with_bonjour:--with-bonjour} \
        %{?with_kerberos5:--with-gssapi} \
        %{?with_ldap:--with-ldap} \
+       %{?with_io_uring:--with-liburing} \
+       %{?with_numa:--with-libnuma} \
+       %{?with_curl:--with-libcurl} \
        --with-libxml \
        --with-libxslt \
        --with-openssl \
@@ -1030,6 +1053,7 @@ fi
 %files -n postgresql-static
 %defattr(644,root,root,755)
 %{_libdir}/libpq.a
+%{?with_curl:%{_libdir}/libpq-oauth.a}
 %{_libdir}/libpgcommon.a
 %{_libdir}/libpgfeutils.a
 %{_libdir}/libpgport.a
@@ -1137,6 +1161,12 @@ fi
 %{extensiondir}/xml2--*.sql
 %{extensiondir}/xml2.control
 
+%if %{with curl}
+%files oauth
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libpq-oauth-%{pgsqlversion}.so
+%endif
+
 %files contrib
 %defattr(644,root,root,755)
 %doc contrib/README contrib/spi/*.example