SPECS: postgresql.spec - usermod for homedir ok to be called from ...

[glen]

Author: glen                         Date: Wed Mar 19 14:24:12 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- usermod for homedir ok to be called from trigger
- adapter (yea i know those could be symlinks)

---- Files affected:
SPECS:
   postgresql.spec (1.403 -> 1.404) 

---- Diffs:

================================================================
Index: SPECS/postgresql.spec
diff -u SPECS/postgresql.spec:1.403 SPECS/postgresql.spec:1.404
--- SPECS/postgresql.spec:1.403	Wed Mar 19 14:54:52 2008
+++ SPECS/postgresql.spec	Wed Mar 19 15:24:07 2008
@@ -65,14 +65,15 @@
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires(pre):	/usr/sbin/usermod
+Requires(triggerpostun):	/bin/id
+Requires(triggerpostun):	/usr/sbin/usermod
 Requires:	%{name}-clients = %{version}-%{release}
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	rc-scripts
 Requires:	tzdata
+Obsoletes:	postgresql-module-tsearch2
 Obsoletes:	postgresql-server
 Obsoletes:	postgresql-test
-Obsoletes:	postgresql-module-tsearch2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pgmoduledir	%{_libdir}/postgresql
@@ -893,6 +894,7 @@
 %groupadd -g 88 -r postgres
 %useradd -M -o -r -u 88 -d /home/services/postgres -s /bin/sh -g postgres -c "PostgreSQL Server" postgres
 
+%triggerpostun -- %{name} < 7.2-2
 if [ -n "`/bin/id -u postgres 2>/dev/null`" ]; then
 	/usr/sbin/usermod -d /home/services/postgres postgres
 fi
@@ -1109,9 +1111,9 @@
 %files contrib
 %defattr(644,root,root,755)
 %doc contrib/README
-%{_bindir}/oid2name
-%{_bindir}/pgbench
-%{_bindir}/vacuumlo
+%attr(755,root,root) %{_bindir}/oid2name
+%attr(755,root,root) %{_bindir}/pgbench
+%attr(755,root,root) %{_bindir}/vacuumlo
 %attr(755,root,root) %{_pgmoduledir}/_int.so
 %attr(755,root,root) %{_pgmoduledir}/adminpack.so
 %attr(755,root,root) %{_pgmoduledir}/btree_gist.so
@@ -1161,6 +1163,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.404  2008-03-19 14:24:07  glen
+- usermod for homedir ok to be called from trigger
+- adapter (yea i know those could be symlinks)
+
 Revision 1.403  2008-03-19 13:54:52  glen
 - do PG_VERSION comparision in %pretrans
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/postgresql.spec?r1=1.403&r2=1.404&f=u