[Cluster-devel] conga clustermon.spec.in.in

[kupcevic@sourceware.org <kupcevic@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-08-15 21:27:45

Modified files:
	.              : clustermon.spec.in.in 

Log message:
	Fix issues blocking package Review for Inclusion

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&r1=1.3&r2=1.4

--- conga/clustermon.spec.in.in	2006/08/15 04:15:51	1.3
+++ conga/clustermon.spec.in.in	2006/08/15 21:27:45	1.4
@@ -24,7 +24,7 @@
 URL: http://sources.redhat.com/cluster/conga
 
 Group: System Environment/Base
-Summary: cluster snmp agent, cim provider and ricci module - source code
+Summary: Red Hat Enterprise Linux Cluster Suite remote management
 
 Source0: %{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,17 +69,17 @@
 
 %package -n modcluster
 Group: System Environment/Base
-Summary: Red Hat Enterprise Linux Cluster Suite - ricci module
-URL: http://sources.redhat.com/cluster/conga
 
-Requires: chkconfig initscripts
-Requires: oddjob openssl
-Requires: sed util-linux
+Requires: oddjob dbus openssl
+Requires: initscripts util-linux
+Requires(post): chkconfig initscripts util-linux sed SysVinit
+Requires(preun): chkconfig initscripts
+Requires(postun): initscripts util-linux
 Conflicts: clumon
 Conflicts: ricci-modcluster
 
 %description -n modcluster
-ricci management module for Red Hat Enterprise Linux Cluster Suite.
+ricci management module for Red Hat Enterprise Linux Cluster Suite
 
 
 %files -n modcluster
@@ -91,30 +91,34 @@
 			%{_sbindir}/modclusterd
 			%{_docdir}/modcluster-%{version}/
 
+
 %post -n modcluster
-/sbin/chkconfig --add modclusterd
+/sbin/chkconfig --list modclusterd >/dev/null 2>&1
+if [ "1$?" != "10" ]; then
+   /sbin/chkconfig --add modclusterd
+fi
 /bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
 /sbin/service oddjobd reload > /dev/null 2>&1
+
+# start modclusterd only if not explicitly disabled (in current runlevel)
 RUNS=(`/sbin/runlevel`)
 RUNLEVEL=${RUNS[1]}
 STATE=`/sbin/chkconfig --list modclusterd | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
 if [ "$STATE" = "on" ]; then
-   /sbin/service modclusterd restart > /dev/null 2>&1
+   /sbin/service modclusterd start > /dev/null 2>&1
 fi
 
 %preun -n modcluster
-if [ "$1" = "0" ]; then
-   /sbin/service modclusterd stop > /dev/null 2>&1
+/sbin/service modclusterd stop > /dev/null 2>&1
+if [ "1$1" = "10" ]; then
    /sbin/chkconfig --del modclusterd
 fi
 
 %postun -n modcluster
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd reload > /dev/null 2>&1
-if [ "$1" -ge "1" ]; then
-   /sbin/service modclusterd condrestart > /dev/null 2>&1
+if [ "1$1" = "10" ]; then
+   /bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
+   /sbin/service oddjobd reload > /dev/null 2>&1
 fi
-exit 0
 
 
 
@@ -124,16 +128,16 @@
 
 %package -n cluster-snmp
 Group: System Environment/Base
-Summary: Red Hat Enterprise Linux Cluster Suite - SNMP agent
-URL: http://sources.redhat.com/cluster/conga
 
 Requires: modcluster = %{version}-%{release}
 Requires: net-snmp 
 Requires: oddjob openssl
+Requires(post): initscripts
+Requires(postun): initscripts
 Conflicts: clumon-snmp
 
 %description -n cluster-snmp
-SNMP agent for Red Hat Enterprise Linux Cluster Suite.
+SNMP agent for Red Hat Enterprise Linux Cluster Suite
 
 %files -n cluster-snmp
 %defattr(-,root,root)
@@ -142,23 +146,14 @@
 			%{_datadir}/snmp/mibs/REDHAT-CLUSTER-MIB
 			%{_docdir}/cluster-snmp-%{version}/
 
-%pre -n cluster-snmp
-exit 0
-
 %post -n cluster-snmp
-#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-#/sbin/service oddjobd reload > /dev/null 2>&1
 /sbin/service snmpd condrestart > /dev/null 2>&1
-exit 0
-
-%preun -n cluster-snmp
-exit 0
 
 %postun -n cluster-snmp
-#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-#/sbin/service oddjobd reload > /dev/null 2>&1
-/sbin/service snmpd condrestart > /dev/null 2>&1
-exit 0
+# don't restart snmpd twice on upgrades
+if [ "1$1" = "10" ]; then
+   /sbin/service snmpd condrestart > /dev/null 2>&1
+fi
 
 
 
@@ -169,12 +164,12 @@
 
 %package -n cluster-cim
 Group: System Environment/Base
-Summary: Red Hat Enterprise Linux Cluster Suite - CIM provider
-URL: http://sources.redhat.com/cluster/conga
 
 Requires: modcluster = %{version}-%{release}
 Requires: tog-pegasus 
 Requires: oddjob openssl
+Requires(post): initscripts
+Requires(postun): initscripts
 Conflicts: clumon-cim
 
 %description -n cluster-cim
@@ -185,22 +180,17 @@
 			%{PEGASUS_PROVIDERS_DIR}/libRedHatClusterProvider.so
 			%{_docdir}/cluster-cim-%{version}/
 
-%pre -n cluster-cim
-exit 0
-
 %post -n cluster-cim
-#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-#/sbin/service oddjobd reload > /dev/null 2>&1
 /sbin/service tog-pegasus condrestart > /dev/null 2>&1
-exit 0
-
-%preun -n cluster-cim
+# pegasus might not be running, don't fail %post
 exit 0
 
 %postun -n cluster-cim
-#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-#/sbin/service oddjobd reload > /dev/null 2>&1
-/sbin/service tog-pegasus condrestart > /dev/null 2>&1
+# don't restart pegasus twice on upgrades
+if [ "1$1" = "10" ]; then
+   /sbin/service tog-pegasus condrestart > /dev/null 2>&1
+fi
+# pegasus might not be running, don't fail %postun
 exit 0
 
 
@@ -213,6 +203,9 @@
 
 
 %changelog
+* Tue Aug 15 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-11.6
+- Implement support for Cluster Suite 5
+
 * Wed Aug 09 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-11
-- Rebirth: separate clustermon.srpm (modcluster, cluster-snmp and 
+- Spinoff: separate clustermon.srpm (modcluster, cluster-snmp and 
    cluster-cim) from conga.srpm