[Cluster-devel] conga ./clustermon.spec.in.in make/version.in

[kupcevic at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-08-17 19:12:54

Modified files:
	.              : clustermon.spec.in.in 
	make           : version.in 

Log message:
	- don't start modcluster after instalation
	- minor spec file changes

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.14&r2=1.15

--- conga/clustermon.spec.in.in	2006/08/16 06:34:19	1.7
+++ conga/clustermon.spec.in.in	2006/08/17 19:12:54	1.8
@@ -29,35 +29,29 @@
 Source0: %{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: glibc-devel gcc-c++ libxml2-devel make
+BuildRequires: glibc-devel gcc-c++ libxml2-devel
 BuildRequires: openssl-devel dbus-devel pam-devel
 BuildRequires: net-snmp-devel tog-pegasus-devel
 
 %description
-This package contains source code of 
-Red Hat Enterprise Linux Cluster Suite ricci/SNMP/CIM module/agent/provider.
+This package contains Red Hat Enterprise Linux Cluster Suite 
+SNMP/CIM module/agent/provider.
 
 
 %prep
 %setup -q
 
-
 %build
-rm -rf $RPM_BUILD_ROOT
-#./configure --arch=%{_arch} --sbindir=%{_sbindir} --libdir=%{_libdir} --docdir=%{_docdir}
 %configure      --arch=%{_arch} \
 		--docdir=%{_docdir} \
 		--pegasus_providers_dir=%{PEGASUS_PROVIDERS_DIR} \
 		--include_zope_and_plone=no
-#make %{?_smp_mflags}
-make clustermon
-
+make %{?_smp_mflags} clustermon
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install_clustermon
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -68,8 +62,7 @@
 
 
 %package -n modcluster
-Group: System Environment/Base
-Summary: Red Hat Enterprise Linux Cluster Suite remote management
+Summary: Red Hat Enterprise Linux Cluster Suite - remote management
 
 Requires: oddjob dbus openssl
 Requires: initscripts util-linux
@@ -80,7 +73,7 @@
 Conflicts: ricci-modcluster
 
 %description -n modcluster
-ricci management module for Red Hat Enterprise Linux Cluster Suite.
+Management module for Red Hat Enterprise Linux Cluster Suite.
 
 
 %files -n modcluster
@@ -98,28 +91,23 @@
 if [ "1$?" != "10" ]; then
    /sbin/chkconfig --add modclusterd
 fi
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
+/bin/kill -s SIGHUP `cat /var/run/messagebus.pid` > /dev/null 2>&1
 /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 [ "1$STATE" = "1on" ]; then
-   /sbin/service modclusterd start > /dev/null 2>&1
-fi
-
 %preun -n modcluster
-/sbin/service modclusterd stop > /dev/null 2>&1
-if [ "1$1" = "10" ]; then
+if [ "1$1" == "10" ]; then
+   /sbin/service modclusterd stop > /dev/null 2>&1
    /sbin/chkconfig --del modclusterd
 fi
 
 %postun -n modcluster
-if [ "1$1" = "10" ]; then
-   /bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
+if [ "1$1" == "10" ]; then
+   /bin/kill -s SIGHUP `cat /var/run/messagebus.pid` > /dev/null 2>&1
    /sbin/service oddjobd reload > /dev/null 2>&1
 fi
+if [ "1$1" == "11" ]; then
+   /sbin/service modclusterd condrestart > /dev/null 2>&1
+fi
 
 
 
@@ -128,8 +116,7 @@
 
 
 %package -n cluster-snmp
-Group: System Environment/Base
-Summary: Red Hat Enterprise Linux Cluster Suite remote management
+Summary: Red Hat Enterprise Linux Cluster Suite - SNMP agent
 
 Requires: modcluster = %{version}-%{release}
 Requires: net-snmp 
@@ -153,7 +140,7 @@
 
 %postun -n cluster-snmp
 # don't restart snmpd twice on upgrades
-if [ "1$1" = "10" ]; then
+if [ "1$1" == "10" ]; then
    /sbin/service snmpd condrestart > /dev/null 2>&1
 fi
 
@@ -165,8 +152,7 @@
 
 
 %package -n cluster-cim
-Group: System Environment/Base
-Summary: Red Hat Enterprise Linux Cluster Suite remote management
+Summary: Red Hat Enterprise Linux Cluster Suite - CIM provider
 
 Requires: modcluster = %{version}-%{release}
 Requires: tog-pegasus 
@@ -190,7 +176,7 @@
 
 %postun -n cluster-cim
 # don't restart pegasus twice on upgrades
-if [ "1$1" = "10" ]; then
+if [ "1$1" == "10" ]; then
    /sbin/service tog-pegasus condrestart > /dev/null 2>&1
 fi
 # pegasus might not be running, don't fail %postun
@@ -206,11 +192,10 @@
 
 
 %changelog
-* Wed Aug 16 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-11.7
+* Wed Aug 16 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-12
 - Move modcluster from /usr/sbin to /usr/libexec
-
-* Tue Aug 15 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-11.6
 - Implement support for Cluster Suite 5
+- Don't auto-start modclusterd after installation, do it manually
 
 * Wed Aug 09 2006 Stanko Kupcevic <kupcevic at redhat.com> 0.8-11
 - Spinoff: separate clustermon.srpm (modcluster, cluster-snmp and 
--- conga/make/version.in	2006/08/15 21:31:29	1.14
+++ conga/make/version.in	2006/08/17 19:12:54	1.15
@@ -1,2 +1,2 @@
 VERSION=0.8
-RELEASE=11.6
+RELEASE=12