X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=postgresql.spec;h=57c5aad03d11bea2456171d3241c04145b9fdfcc;hb=e3bed88e2502a74b99d20051bd51bf8890677837;hp=c0f9241ceea52511ef795ab99f0d0b265bab5bac;hpb=bf738fa094f9765e2808247ea731ee1a07cfb855;p=packages%2Fpostgresql.git

diff --git a/postgresql.spec b/postgresql.spec
index c0f9241..57c5aad 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -29,7 +29,7 @@ Summary(uk.UTF-8):	PostgreSQL - система керування базами 
 Summary(zh_CN.UTF-8):	PostgreSQL 客户端程序和库文件
 Name:		postgresql%{pgver}
 Version:	%{pgver}.%{pgminver}
-Release:	1.1
+Release:	2
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
@@ -45,6 +45,7 @@ Patch3:		per-version-dirs.patch
 Patch4:		postgresql-disable_horology_test.patch
 Patch5:		postgresql-heimdal.patch
 Patch6:		postgresql-link.patch
+Patch7:		socket-dir-fixes.patch
 URL:		http://www.postgresql.org/
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake
@@ -595,6 +596,7 @@ Różne moduły dołączone do PostgreSQL-a.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # force rebuild of bison/flex files
 find src -name \*.l -o -name \*.y | xargs touch
@@ -656,7 +658,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} \
+	$RPM_BUILD_ROOT/var/{lib/pgsql,log,run/postgresql} \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \
 	$RPM_BUILD_ROOT%{_mandir}
 
@@ -751,15 +753,21 @@ if [ "$foundold" = "1" ]; then
 	exit 1
 fi
 
-%triggerpostun -- %{name} < 7.2-2
-if [ -n "`/bin/id -u postgres 2>/dev/null`" ]; then
-	/usr/sbin/usermod -d /home/services/postgres postgres
-fi
-
-%triggerpostun -- %{name} < 10.2-2
+%triggerpostun -- postgresql < 10.5-2
 if [ -n "`/bin/id -u postgres 2>/dev/null`" ]; then
 	/usr/sbin/usermod -d /var/lib/pgsql 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
+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*"
+echo "files so they reflect your changes."
+echo
 
 %post
 /sbin/chkconfig --add postgresql10
@@ -775,7 +783,7 @@ fi
 %groupadd -g 88 -r postgres
 %useradd -M -o -r -u 88 -d /var/lib/pgsql -s /bin/sh -g postgres -c "PostgreSQL Server" postgres
 
-%post	clients
+%posttrans	clients
 update-alternatives \
 	--install %{_bindir}/clusterdb clusterdb %{pgsqllibdir}/bin/clusterdb %{pgver}%{pgminver} \
 	--slave %{_mandir}/man1/clusterdb.1 clusterdb.1 %{pgsqldatadir}/man/man1/clusterdb.1* || :
@@ -833,7 +841,7 @@ if [ $1 -eq 0 ]; then
 	update-alternatives --remove vacuumdb %{pgsqllibdir}/bin/vacuumdb || :
 fi
 
-%post	-n postgresql-devel
+%posttrans	-n postgresql-devel
 update-alternatives \
 	--install %{_bindir}/pg_config pg_config %{pgsqllibdir}/bin/pg_config %{pgver}%{pgminver} \
 	--slave %{_mandir}/man1/pg_config.1 pg_config.1 %{pgsqldatadir}/man/man1/pg_config.1* || :
@@ -921,6 +929,7 @@ update-alternatives \
 %dir %{_libdir}/postgresql
 %dir %{_datadir}/postgresql
 %attr(700,postgres,postgres) %dir /var/lib/pgsql
+%attr(700,postgres,postgres) %dir /var/run/postgresql
 
 %files dirs
 %defattr(644,root,root,755)