From: Devrim Gunduz <devrim@gunduz.org>
Date: Mon, 22 Sep 2025 00:30:36 +0000 (-0500)
Subject: PostgreSQL 17: Rename sysuser.d file name to avoid clash with RHEL/Fedora packaging... 
X-Git-Url: http://git.postgresql.org/gitweb/edit?a=commitdiff_plain;h=375ed383f197621a2f605b66abe2322c06dbc280;p=pgrpms.git

PostgreSQL 17: Rename sysuser.d file name to avoid clash with RHEL/Fedora packaging. Also fix some macros
---

diff --git a/rpm/redhat/main/non-common/postgresql-17/main/postgresql-17.spec b/rpm/redhat/main/non-common/postgresql-17/main/postgresql-17.spec
index e4b56f2b1..d98c202ea 100644
--- a/rpm/redhat/main/non-common/postgresql-17/main/postgresql-17.spec
+++ b/rpm/redhat/main/non-common/postgresql-17/main/postgresql-17.spec
@@ -252,9 +252,7 @@ PostgreSQL server.
 Summary:	The programs needed to create and run a PostgreSQL server
 Requires:	%{name}%{?_isa} = %{version}-%{release}
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
-%if %sysuserd
-:
-%else
+%if ! %sysuserd
 Requires(pre):	/usr/sbin/useradd /usr/sbin/groupadd
 %endif
 
@@ -681,7 +679,7 @@ touch -r %{SOURCE10} %{sname}-%{pgmajorversion}-check-db-dir
 
 %if %sysuserd
 # Install sysusers.d config file to allow rpm to create users/groups automatically.
-%{__install} -m 0644 -D %{SOURCE20} %{buildroot}%{_sysusersdir}/%{sname}%{pgpackageversion}.conf
+%{__install} -m 0644 -D %{SOURCE20} %{buildroot}%{_sysusersdir}/%{sname}%{pgpackageversion}-pgdg.conf
 %endif
 
 %if %test
@@ -781,9 +779,7 @@ cat initdb-%{pgmajorversion}.lang pg_ctl-%{pgmajorversion}.lang psql-%{pgmajorve
 cat postgres-%{pgmajorversion}.lang pg_resetwal-%{pgmajorversion}.lang pg_checksums-%{pgmajorversion}.lang pg_verifybackup-%{pgmajorversion}.lang pg_controldata-%{pgmajorversion}.lang plpgsql-%{pgmajorversion}.lang pg_test_timing-%{pgmajorversion}.lang pg_test_fsync-%{pgmajorversion}.lang pg_archivecleanup-%{pgmajorversion}.lang pg_waldump-%{pgmajorversion}.lang pg_rewind-%{pgmajorversion}.lang pg_upgrade-%{pgmajorversion}.lang > pg_server.lst
 %endif
 
-%if %sysuserd
-:
-%else
+%if ! %sysuserd
 # This is replaced by sysusers.d in recent OSes:
 %pre server
 groupadd -g 26 -o -r postgres >/dev/null 2>&1 || :
@@ -1126,7 +1122,7 @@ fi
 %{_bindir}/%{sname}-%{pgmajorversion}-setup
 %{pgbaseinstdir}/bin/%{sname}-%{pgmajorversion}-check-db-dir
 %if %sysuserd
-%{_sysusersdir}/%{sname}%{pgpackageversion}.conf
+%{_sysusersdir}/%{sname}%{pgpackageversion}-pgdg.conf
 %endif
 %{_tmpfilesdir}/%{sname}-%{pgmajorversion}.conf
 %{_unitdir}/%{sname}-%{pgmajorversion}.service