SPECS: inn.spec - concise %post

[gotar]

Author: gotar                        Date: Thu Feb 12 14:07:26 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- concise %post

---- Files affected:
SPECS:
   inn.spec (1.183 -> 1.184) 

---- Diffs:

================================================================
Index: SPECS/inn.spec
diff -u SPECS/inn.spec:1.183 SPECS/inn.spec:1.184
--- SPECS/inn.spec:1.183	Mon Aug 18 17:14:48 2008
+++ SPECS/inn.spec	Thu Feb 12 15:07:20 2009
@@ -359,34 +359,29 @@
 if [ "`getent passwd news | cut -d: -f6`" = "/var/spool/news" ]; then
 	/usr/sbin/usermod -d /home/services/news news
 fi
+
 umask 022
-if [ -f /var/lib/news/history ]; then
-	cd /var/lib/news
-	%{_bindir}/makedbz -s `wc -l <history` -f history
-	for i in dir hash index pag; do
-		[ -f history.n.$i ] && mv history.n.$i history.$i
-	done
-	chown news:news history.*
-	chmod 644 history.*
-else
-	cd /var/lib/news
+cd /var/lib/news
+if [ ! -f /var/lib/news/history ]; then
 	# makehistory fails on uninitialized spool(?) - create empty history in such case
-	%{_bindir}/makehistory || ( echo "Creating empty history instead." ; touch history )
-	%{_bindir}/makedbz -s `wc -l <history` -f history
-	for i in dir hash index pag; do
-		[ -f history.n.$i ] && mv history.n.$i history.$i
-	done
-	chown news:news history history.*
-	chmod 644 history history.*
+	%{_bindir}/makehistory || { echo "Creating empty history"; :> history; }
+	chown news:news history
+	chmod 644 history
 fi
+%{_bindir}/makedbz -s `wc -l history` -f history
+for i in dir hash index pag; do
+	[ -f history.n.$i ] && mv history.n.$i history.$i
+done
+chown news:news history.*
+chmod 644 history.*
 
 if [ ! -f /var/lib/news/active.times ]; then
-	touch /var/lib/news/active.times
+	:> /var/lib/news/active.times
 	chown news:news /var/lib/news/active.times
 fi
 
 if [ ! -f /var/lib/news/.news.daily ]; then
-	touch /var/lib/news/.news.daily
+	:> /var/lib/news/.news.daily
 	chown news:news /var/lib/news/.news.daily
 	chmod 664 /var/lib/news/.news.daily
 fi
@@ -646,6 +641,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.184  2009/02/12 14:07:20  gotar
+- concise %post
+
 Revision 1.183  2008/08/18 15:14:48  blues
 - add nnrpd_no_trace.patch - don't put L_TRACE messages to log, causes big
   load of syslog daemon, even if you put it /dev/null
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/inn.spec?r1=1.183&r2=1.184&f=u