PostgreSQL 19 and 18: Rename sysuser.d file name to avoid clash with RHEL/Fedora...

diff --git a/rpm/redhat/main/non-common/postgresql-18/main/postgresql-18.spec b/rpm/redhat/main/non-common/postgresql-18/main/postgresql-18.spec
index a7357657863e3cf2d245a7f77527eda7e3114467..6c0d3d8473b6989d31210dbb861c5b6eee9782f5 100644 (file)
--- a/rpm/redhat/main/non-common/postgresql-18/main/postgresql-18.spec
+++ b/rpm/redhat/main/non-common/postgresql-18/main/postgresql-18.spec
@@ -723,7 +723,7 @@ touch -r %{SOURCE10} %{sname}-%{pgmajorversion}-check-db-dir
 %{__install} -m 700 %{SOURCE9} %{buildroot}%{pgbaseinstdir}/share/
 
 # 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
 
 %if %test
        # tests. There are many files included here that are unnecessary,
@@ -1228,7 +1228,7 @@ fi
 %{pgbaseinstdir}/bin/%{sname}-%{pgmajorversion}-setup
 %{_bindir}/%{sname}-%{pgmajorversion}-setup
 %{pgbaseinstdir}/bin/%{sname}-%{pgmajorversion}-check-db-dir
-%{_sysusersdir}/%{sname}%{pgpackageversion}.conf
+%{_sysusersdir}/%{sname}%{pgpackageversion}-pgdg.conf
 %{_tmpfilesdir}/%{sname}-%{pgmajorversion}.conf
 %{_unitdir}/%{sname}-%{pgmajorversion}.service
 %if %pam

diff --git a/rpm/redhat/main/non-common/postgresql-19/main/postgresql-19.spec b/rpm/redhat/main/non-common/postgresql-19/main/postgresql-19.spec
index 98e2f5bad6fb464c034260df3d512d158c2b6156..5a582481e7503d78e22ab8937a34495de9a03c07 100644 (file)
--- a/rpm/redhat/main/non-common/postgresql-19/main/postgresql-19.spec
+++ b/rpm/redhat/main/non-common/postgresql-19/main/postgresql-19.spec
@@ -723,7 +723,7 @@ touch -r %{SOURCE10} %{sname}-%{pgmajorversion}-check-db-dir
 %{__install} -d -m 755 %{buildroot}%{pgbaseinstdir}/share/
 %{__install} -m 700 %{SOURCE9} %{buildroot}%{pgbaseinstdir}/share/
 
-%{__install} -m 0644 -D %{SOURCE20} %{buildroot}%{_sysusersdir}/%{sname}%{pgpackageversion}.conf
+%{__install} -m 0644 -D %{SOURCE20} %{buildroot}%{_sysusersdir}/%{sname}%{pgpackageversion}-pgdg.conf
 
 %if %test
        # tests. There are many files included here that are unnecessary,
@@ -1228,7 +1228,7 @@ fi
 %{pgbaseinstdir}/bin/%{sname}-%{pgmajorversion}-setup
 %{_bindir}/%{sname}-%{pgmajorversion}-setup
 %{pgbaseinstdir}/bin/%{sname}-%{pgmajorversion}-check-db-dir
-%{_sysusersdir}/%{sname}%{pgpackageversion}.conf
+%{_sysusersdir}/%{sname}%{pgpackageversion}-pgdg.conf
 %{_tmpfilesdir}/%{sname}-%{pgmajorversion}.conf
 %{_unitdir}/%{sname}-%{pgmajorversion}.service
 %if %pam