SPECS: prewikka.spec - unify

[glen]

Author: glen                         Date: Sat Jan  6 21:41:25 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify

---- Files affected:
SPECS:
   prewikka.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/prewikka.spec
diff -u SPECS/prewikka.spec:1.9 SPECS/prewikka.spec:1.10
--- SPECS/prewikka.spec:1.9	Sat Jan  6 21:22:42 2007
+++ SPECS/prewikka.spec	Sat Jan  6 22:41:19 2007
@@ -12,10 +12,10 @@
 Source2:	%{name}.sysconfig
 URL:		http://www.prelude-ids.org/
 BuildRequires:	python-cheetah
+Requires:	python-cheetah
 Requires:	python-libprelude
 Requires:	python-libpreludedb
 Requires:	python-modules
-Requires:	python-cheetah
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -36,7 +36,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-python setup.py install --optimize=2 \
+python setup.py install \
+	--optimize=2 \
 	--root=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
@@ -69,9 +70,7 @@
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/prewikka ]; then
-		%service prewikka stop 1>&2
-	fi
+	%service prewikka stop
 	/sbin/chkconfig --del prewikka
 fi
 
@@ -108,8 +107,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007/01/06 21:41:19  glen
+- unify
+
 Revision 1.9  2007/01/06 20:22:42  arekm
-- up from Tomasz Rutkowski
+- up 0.9.8 from Tomasz Rutkowski
 
 Revision 1.8  2006/05/16 10:39:17  mguevara
 - 0.9.5-0.1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/prewikka.spec?r1=1.9&r2=1.10&f=u