X-Git-Url: https://git.tld-linux.org/?p=packages%2Fpostgresql.git;a=blobdiff_plain;f=postgresql.spec;h=54f27bee0ec299284d513a46b732ff6765140118;hp=5163b5e110ea4b46b4a632342330b467ee3f9991;hb=0e7386e6d2212c4518a15908557116feaabe1e13;hpb=a6aaf40a53ea1e550e99c787c07a60a0255149cd

diff --git a/postgresql.spec b/postgresql.spec
index 5163b5e..54f27be 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -659,7 +659,7 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig}} \
-	$RPM_BUILD_ROOT/var/{lib/pgsql,log,run/postgresql} \
+	$RPM_BUILD_ROOT/var/{lib/postgresql/%{pgsqlversion},log,run/postgresql} \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \
 	$RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
 
@@ -759,14 +759,14 @@ fi
 
 %triggerpostun -- postgresql < 10.5-2
 if [ -n "`/bin/id -u postgres 2>/dev/null`" ]; then
-	/usr/sbin/usermod -d /var/lib/pgsql postgres
+	/usr/sbin/usermod -d /var/lib/postgresql postgres
 fi
 echo
 echo "This version of PostgreSQL uses new default location for database clusters."
 echo "Please move your existing clusters before starting PostgreSQL so they follow"
 echo "below scheme:"
 echo
-echo "/var/lib/pgsql/<version>/<name>"
+echo "/var/lib/postgresql/<version>/<name>"
 echo
 echo "where <version> means PostgreSQL version like 9.6 or 10 and name is cluster"
 echo "name of your choice. When done, be sure to update /etc/sysconfig/postgresql*"
@@ -785,7 +785,7 @@ fi
 
 %pre	-n postgresql-common
 %groupadd -g 88 -r postgres
-%useradd -M -o -r -u 88 -d /var/lib/pgsql -s /bin/sh -g postgres -c "PostgreSQL Server" postgres
+%useradd -M -o -r -u 88 -d /var/lib/postgresql -s /bin/sh -g postgres -c "PostgreSQL Server" postgres
 
 %posttrans	clients
 update-alternatives \
@@ -926,7 +926,7 @@ fi
 %defattr(644,root,root,755)
 %dir %{_libdir}/postgresql
 %dir %{_datadir}/postgresql
-%attr(700,postgres,postgres) %dir /var/lib/pgsql
+%attr(700,postgres,postgres) %dir /var/lib/postgresql
 %attr(700,postgres,postgres) %dir /var/run/postgresql
 
 %files dirs
@@ -939,6 +939,7 @@ fi
 %dir %{pgsqldatadir}/man/man1
 %dir %{pgsqldatadir}/man/man3
 %dir %{pgsqldatadir}/man/man7
+%attr(700,postgres,postgres) %dir /var/lib/postgresql/%{pgsqlversion}
 
 %files doc
 %defattr(644,root,root,755)