From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 21 Jan 2008 23:17:26 -0000 Subject: [Cluster-devel] conga ./clustermon.spec.in.in make/version.in Message-ID: <20080121231726.7049.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: conga Branch: RHEL5 Changes by: rmccabe at sourceware.org 2008-01-21 23:17:26 Modified files: . : clustermon.spec.in.in make : version.in Log message: - Update the version number - Update the spec file with the bz# for the RHEL52 fix. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.18.2.27&r2=1.18.2.28 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.28&r2=1.21.2.29 --- conga/clustermon.spec.in.in 2007/12/06 03:03:40 1.18.2.27 +++ conga/clustermon.spec.in.in 2008/01/21 23:17:25 1.18.2.28 @@ -1,20 +1,18 @@ -############################################################################### -############################################################################### -## -## Copyright (C) 2006-2007 Red Hat, Inc. All rights reserved. -## -## This copyrighted material is made available to anyone wishing to use, -## modify, copy, or redistribute it subject to the terms and conditions -## of the GNU General Public License v.2. -## -############################################################################### +############################################################################## +# +# Copyright (C) 2006-2008 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License version 2. +# ############################################################################### %define PEGASUS_PROVIDERS_DIR %{_libdir}/Pegasus/providers -############ SRPM ################### +############ SRPM ################### Name: clustermon @@ -29,12 +27,10 @@ Source0: %{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: ppc s390 - +BuildRequires: cman-devel BuildRequires: glibc-devel gcc-c++ libxml2-devel BuildRequires: openssl-devel dbus-devel pam-devel pkgconfig BuildRequires: net-snmp-devel tog-pegasus-devel -BuildRequires: cman-devel %description This package contains Red Hat Enterprise Linux Cluster Suite @@ -61,7 +57,7 @@ -### cluster module ### +### cluster module ### %package -n modcluster @@ -92,31 +88,32 @@ %post -n modcluster /sbin/chkconfig --add modclusterd -DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null` -/bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1 +DBUS_PID=`cat /var/run/messagebus.pid 2>/dev/null` +/bin/kill -s SIGHUP $DBUS_PID >&/dev/null # It's ok if this fails (it will fail when oddjob is not running). -/sbin/service oddjobd reload > /dev/null 2>&1 || true +/sbin/service oddjobd reload >&/dev/null +exit 0 %preun -n modcluster if [ "$1" == "0" ]; then - /sbin/service modclusterd stop > /dev/null 2>&1 + /sbin/service modclusterd stop >&/dev/null /sbin/chkconfig --del modclusterd fi +exit 0 %postun -n modcluster if [ "$1" == "0" ]; then DBUS_PID=`cat /var/run/messagebus.pid 2> /dev/null` - /bin/kill -s SIGHUP $DBUS_PID > /dev/null 2>&1 - /sbin/service oddjobd reload > /dev/null 2>&1 + /bin/kill -s SIGHUP $DBUS_PID >&/dev/null + /sbin/service oddjobd reload >&/dev/null fi if [ "$1" == "1" ]; then - /sbin/service modclusterd condrestart > /dev/null 2>&1 + /sbin/service modclusterd condrestart >&/dev/null fi +exit 0 - - -### cluster-snmp ### +### cluster-snmp ### %package -n cluster-snmp @@ -141,20 +138,19 @@ %{_docdir}/cluster-snmp-%{version}/ %post -n cluster-snmp -/sbin/service snmpd condrestart > /dev/null 2>&1 || true +/sbin/service snmpd condrestart >&/dev/null +exit 0 %postun -n cluster-snmp # don't restart snmpd twice on upgrades if [ "$1" == "0" ]; then - /sbin/service snmpd condrestart > /dev/null 2>&1 + /sbin/service snmpd condrestart >&/dev/null fi +exit 0 - - -### cluster-cim ### - +### cluster-cim ### %package -n cluster-cim Group: System Environment/Base @@ -177,12 +173,13 @@ %post -n cluster-cim # pegasus might not be running, don't fail %post -/sbin/service tog-pegasus condrestart > /dev/null 2>&1 || true +/sbin/service tog-pegasus condrestart >&/dev/null +exit 0 %postun -n cluster-cim # don't restart pegasus twice on upgrades if [ "$1" == "0" ]; then - /sbin/service tog-pegasus condrestart > /dev/null 2>&1 + /sbin/service tog-pegasus condrestart >&/dev/null fi # pegasus might not be running, don't fail %postun exit 0 @@ -196,8 +193,8 @@ %changelog -* Tue Dec 04 2007 Ryan McCabe 0.10.0-5.1 -* Fixed bz368341 (Conga displays quorum status incorrectly when qdisk is used) +* Mon Jan 21 2008 Ryan McCabe 0.12.0-1 +* Fixed bz317541 (Conga displays quorum status incorrectly when qdisk is used) * Mon Aug 20 2007 Ryan McCabe 0.10.0-5 - Fixed bz253341 (failure to start cluster service which had been modifed for correction) --- conga/make/version.in 2007/12/06 03:03:40 1.21.2.28 +++ conga/make/version.in 2008/01/21 23:17:26 1.21.2.29 @@ -1,6 +1,2 @@ -VERSION=0.10.0 -RELEASE=5 -# Remove "_UNRELEASED" at release time. -# Put release num at the beggining, -# so that after it gets released, it has -# seniority over UNRELEASED one +VERSION=0.12.0 +RELEASE=0