SPECS: bopm.spec - fix bcond and deps

glen glen at pld-linux.org
Mon Sep 4 17:14:57 CEST 2006


Author: glen                         Date: Mon Sep  4 15:14:57 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix bcond and deps

---- Files affected:
SPECS:
   bopm.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: SPECS/bopm.spec
diff -u SPECS/bopm.spec:1.21 SPECS/bopm.spec:1.22
--- SPECS/bopm.spec:1.21	Mon Sep  4 17:03:47 2006
+++ SPECS/bopm.spec	Mon Sep  4 17:14:52 2006
@@ -10,7 +10,7 @@
 Summary(pl):	Monitorowanie i blokowanie otwartych proxy do używania z ircd
 Name:		bopm
 Version:	3.1.2
-Release:	0.23
+Release:	0.28
 License:	GPL
 Group:		Applications/Communications
 Source0:	http://static.blitzed.org/www.blitzed.org/bopm/files/%{name}-%{version}.tar.gz
@@ -31,7 +31,7 @@
 BuildRequires:	libtool
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpmbuild(macros) >= 1.268
-Requires(post,preun):	/sbin/chkconfig
+%{!?with_supervise:Requires(post,preun):	/sbin/chkconfig}
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
@@ -198,12 +198,15 @@
 
 %post
 %if %{with supervise}
-/sbin/chkconfig --add %{name}
-%service %{name} restart "BOPM daemon"
-%else
 if [ -d /service/%{name}/supervise ]; then
 	svc -t /service/%{name} /service/%{name}/log
 fi
+if [ "$1" = 1 ]; then
+	ln -snf %{_supervise} /service/%{name}
+fi
+%else
+/sbin/chkconfig --add %{name}
+%service %{name} restart "BOPM daemon"
 %endif
 
 %preun
@@ -286,6 +289,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2006/09/04 15:14:52  glen
+- fix bcond and deps
+
 Revision 1.21  2006/09/04 15:03:47  glen
 - use supervise to respawn process as it crashes without traces
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/bopm.spec?r1=1.21&r2=1.22&f=u



More information about the pld-cvs-commit mailing list