- release++

[packages/postgresql.git] / postgresql.spec

diff --git a/postgresql.spec b/postgresql.spec
index 22bf6e6963bf80d426bf8b821fcf4330c3b18601..fe3d26794517f48d279944ba155458ef2541c2ba 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -6,7 +6,7 @@ Summary(pl):    PostgreSQL system bazodanowy
 Summary(tr):   Veri Tabaný Yönetim Sistemi
 Name:          postgresql
 Version:       6.5.3
-Release:       4
+Release:       5
 Copyright:     BSD
 Group:         Applications/Databases
 Group(pl):     Aplikacje/Bazy Danych
@@ -356,7 +356,7 @@ make all PGDOCS=unpacked -C doc
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \
         $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/pgsql,%{_mandir},%{_includedir}/pgsql} \
-        $RPM_BUILD_ROOT/var/state/pgsql
+        $RPM_BUILD_ROOT/var/lib/pgsql
 
 # PREFIX (hack for perl)
 ( cd src
@@ -409,12 +409,10 @@ strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so*
 gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man*/*
 
 %pre
-grep -l postgres /etc/group &>/dev/null || (
-    /usr/sbin/groupadd -g 88 -r -f postgres 1>&2 || :
-)
-grep -l postgres /etc/passwd &>/dev/null || (
-    /usr/sbin/useradd -M -o -r -u 88 -d /var/state/pgsql -s /bin/sh \
-       -g postgres -c "PostgreSQL Server" postgres 1>&2 || :
+getgid postgres >/dev/null 2>&1 || /usr/sbin/groupadd -g 88 -r -f postgres
+id postgres >/dev/null 2>&1 || /usr/sbin/useradd -M -o -r -u 88 \
+       -d /var/lib/pgsql -s /bin/sh -g postgres \
+       -c "PostgreSQL Server" postgres
 )
 
 %post
@@ -494,7 +492,7 @@ rm -f /tmp/tmp_perl_info
 %{_mandir}/man1/ipcclean.1*
 %{_mandir}/man5/*.5*
 
-%attr(750,postgres,postgres) %dir /var/state/pgsql
+%attr(750,postgres,postgres) %dir /var/lib/pgsql
 
 %files libs
 %defattr(644,root,root,755)