SPECS: hastymail.spec - fix post; rel 1

[glen]

Author: glen                         Date: Tue Nov 21 20:38:36 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix post; rel 1

---- Files affected:
SPECS:
   hastymail.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/hastymail.spec
diff -u SPECS/hastymail.spec:1.18 SPECS/hastymail.spec:1.19
--- SPECS/hastymail.spec:1.18	Tue Nov 21 20:56:18 2006
+++ SPECS/hastymail.spec	Tue Nov 21 21:38:31 2006
@@ -1,9 +1,11 @@
 # $Revision$, $Date$
+# TODO
+# - use webapps
 Summary:	Hastymail - easy-to-use, fast webmail system
 Summary(pl):	Hastymail - łatwy w użyciu, szybki system webmail
 Name:		hastymail
 Version:	1.5
-Release:	0.3
+Release:	1
 License:	GPL
 Group:		Applications/Mail
 Source0:	http://dl.sourceforge.net/hastymail/%{name}-%{version}.tar.bz2
@@ -53,19 +55,17 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-SECRET=`dd if=/dev/urandom bs=1 count=42 2>/dev/null | od -a -w42 | cut -c8- | sed -e 's![^[:alnum:]]!!g' | xargs`
-if [ -n "$SECRET" ] ; then
-	echo "Updating authentication secret in config files..."
-	sed -i -e 's#\"KEY\"#\"$SECRET\"#g' %{_hastymaildir}/.htaccess
-else
-	echo "Remember to update secret in "
-	echo "    %{_hastymaildir}/.htaccess"
-fi
-if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
+if [ "$1" = 0 ]; then
+	SECRET=`dd if=/dev/urandom bs=1 count=42 2>/dev/null | od -a -w42 | cut -c8- | sed -e 's![^[:alnum:]]!!g' | xargs`
+	if [ -n "$SECRET" ] ; then
+		echo "Updating authentication secret in config files..."
+		sed -i -e 's#\"KEY\"#\"$SECRET\"#g' %{_hastymaildir}/.htaccess
+	else
+		echo "Remember to update secret in "
+		echo "    %{_hastymaildir}/.htaccess"
+	fi
 fi
+%service -q httpd restart
 
 %files
 %defattr(644,root,root,755)
@@ -92,6 +92,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2006/11/21 20:38:31  glen
+- fix post; rel 1
+
 Revision 1.18  2006/11/21 19:56:18  glen
 - rel 0.3: use php(extension) virtuals
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/hastymail.spec?r1=1.18&r2=1.19&f=u