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

- bsc#1206796: Refine the distinction of where to use sysusers and

Browse Source 
use bcond to have the expression only in one place.

OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql?expand=0&rev=145
This commit is contained in:
Reinhard Max 2023-01-09 11:03:44 +00:00 committed by Git OBS Bridge
parent 96a9f148fc
commit 4f12378358
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
postgresql.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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> Thu Sep 22 14:23:49 UTC 2022 - Andreas Schwab <schwab@suse.de>

18
postgresql.spec
View File

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