pool/postgresql
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1057058 from server:database:postgresql

Browse Source 
- bsc#1206796: Refine the distinction of where to use sysusers and
  use bcond to have the expression only in one place.

- riscv64 does not have llvm support yet,
  adapt the %postgresql_has_llvm macro accordingly.

OBS-URL: https://build.opensuse.org/request/show/1057058
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/postgresql?expand=0&rev=66
This commit is contained in:
Dominique Leuenberger 2023-01-10 13:59:27 +00:00 committed by Git OBS Bridge
commit 36626a81c1
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
postgresql-extensions-macros
View File

@ -49,5 +49,5 @@ Recommends: %{pg_name}-llvmjit \
%nil
%pg_version_from_name %define pg_version %( echo %{?pg_name} | sed -e 's|^postgresql||g' )%{nil}
%postgresql_has_llvm (0%{?suse_version} >= 1500 && 0%{?pg_version} >= 11 && 0%{?pg_version} < 90)
%postgresql_has_llvm (0%{?suse_version} >= 1500 && "%{_target_cpu}" != "riscv64" && 0%{?pg_version} >= 11 && 0%{?pg_version} < 90)

12
postgresql.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Jan 9 09:22:55 UTC 2023 - Reinhard Max <max@suse.com>
- bsc#1206796: Refine the distinction of where to use sysusers and
use bcond to have the expression only in one place.
-------------------------------------------------------------------
Thu Sep 22 14:23:49 UTC 2022 - Andreas Schwab <schwab@suse.de>
- riscv64 does not have llvm support yet,
adapt the %postgresql_has_llvm macro accordingly.
-------------------------------------------------------------------
Mon Sep 5 13:12:41 UTC 2022 - Dirk Müller <dmueller@suse.com>

18
postgresql.spec
View File

@ -40,6 +40,14 @@
%bcond_with llvm
%endif
# On SLE-15 up to SP3 sysusers does not support shells
# other than /bin/nologin
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400
%bcond_without sysusers
%else
%bcond_with sysusers
%endif
Name: postgresql
Summary: Basic Clients and Utilities for PostgreSQL
License: PostgreSQL
@ -105,7 +113,7 @@ Requires: postgresql-server-implementation
Requires: postgresql = %version-%release
Recommends: %defaultpackage-server
%if 0%{?suse_version} >= 1315
%if 0%{?suse_version} >= 1500
%if %{with sysusers}
BuildRequires: sysuser-tools
%sysusers_requires
%else
@ -314,7 +322,7 @@ and triggers.
%prep
%build
%if 0%{?suse_version} >= 1500
%if %{with sysusers}
%sysusers_generate_pre %{SOURCE9} %{name}-server %{name}-server.conf
%endif
echo "This is a dummy package to provide a dependency on the default PostgreSQL version." > README
@ -355,7 +363,7 @@ ln -sf /etc/init.d/postgresql %buildroot/usr/sbin/rcpostgresql
install -D -m 0644 %{SOURCE8} %{buildroot}%{_rpmmacrodir}/macros.%{name}
# sysusers.d
%if 0%{?suse_version} >= 1500
%if %{with sysusers}
install -Dm0644 %{SOURCE9} %{buildroot}%{_sysusersdir}/%{name}-server.conf
%endif
@ -363,7 +371,7 @@ install -Dm0644 %{SOURCE9} %{buildroot}%{_sysusersdir}/%{name}-server.conf
%define eflag /run/postgresql-was-enabled
%define aflag /run/postgresql-was-running
%if 0%{?suse_version} >= 1500
%if %{with sysusers}
%pre server -f %{name}-server.pre
%else
%pre server
@ -470,7 +478,7 @@ fi
%config /etc/init.d/postgresql
%dir %attr(1775,postgres,postgres) /var/run/postgresql
%endif
%if 0%{?suse_version} >= 1500
%if %{with sysusers}
%{_sysusersdir}/%{name}-server.conf
%endif