* [Cluster-devel] conga ./clustermon.spec.in.in make/version.in
@ 2006-08-17 19:12 kupcevic
0 siblings, 0 replies; 6+ messages in thread
From: kupcevic @ 2006-08-17 19:12 UTC (permalink / raw)
To: cluster-devel.redhat.com
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@redhat.com> 0.8-11.7
+* Wed Aug 16 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-12
- Move modcluster from /usr/sbin to /usr/libexec
-
-* Tue Aug 15 2006 Stanko Kupcevic <kupcevic@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@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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Cluster-devel] conga ./clustermon.spec.in.in make/version.in
@ 2007-12-04 21:13 rmccabe
0 siblings, 0 replies; 6+ messages in thread
From: rmccabe @ 2007-12-04 21:13 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2007-12-04 21:13:16
Modified files:
. : clustermon.spec.in.in
make : version.in
Log message:
Fixed bz368341 (Conga displays quorum status incorrectly when qdisk is used)
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.18.2.25&r2=1.18.2.26
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.26&r2=1.21.2.27
--- conga/clustermon.spec.in.in 2007/10/22 19:32:06 1.18.2.25
+++ conga/clustermon.spec.in.in 2007/12/04 21:13:16 1.18.2.26
@@ -194,6 +194,9 @@
%changelog
+* Tue Dec 04 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-6
+* Fixed bz368341 (Conga displays quorum status incorrectly when qdisk is used)
+
* Mon Aug 20 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-5
- Fixed bz253341 (failure to start cluster service which had been modifed for correction)
- Resolves: bz253341
--- conga/make/version.in 2007/10/22 19:32:07 1.21.2.26
+++ conga/make/version.in 2007/12/04 21:13:16 1.21.2.27
@@ -1,5 +1,5 @@
-VERSION=0.10.2
-RELEASE=1
+VERSION=0.10.0
+RELEASE=6
# Remove "_UNRELEASED" at release time.
# Put release num at the beggining,
# so that after it gets released, it has
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Cluster-devel] conga ./clustermon.spec.in.in make/version.in
@ 2007-12-06 3:03 rmccabe
0 siblings, 0 replies; 6+ messages in thread
From: rmccabe @ 2007-12-06 3:03 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2007-12-06 03:03:40
Modified files:
. : clustermon.spec.in.in
make : version.in
Log message:
- Don't build for ppc or s390
- Make package version comply with NVR policy
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.18.2.26&r2=1.18.2.27
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.27&r2=1.21.2.28
--- conga/clustermon.spec.in.in 2007/12/04 21:13:16 1.18.2.26
+++ conga/clustermon.spec.in.in 2007/12/06 03:03:40 1.18.2.27
@@ -19,7 +19,7 @@
Name: clustermon
Version: @@VERS@@
-Release: @@REL@@%{?dist}
+Release: @@REL@@%{?dist}.1
License: GPL
URL: http://sources.redhat.com/cluster/conga
@@ -29,6 +29,8 @@
Source0: %{name}-%{version}.tar.gz
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch: ppc s390
+
BuildRequires: glibc-devel gcc-c++ libxml2-devel
BuildRequires: openssl-devel dbus-devel pam-devel pkgconfig
BuildRequires: net-snmp-devel tog-pegasus-devel
@@ -194,7 +196,7 @@
%changelog
-* Tue Dec 04 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-6
+* Tue Dec 04 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-5.1
* Fixed bz368341 (Conga displays quorum status incorrectly when qdisk is used)
* Mon Aug 20 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-5
--- conga/make/version.in 2007/12/04 21:13:16 1.21.2.27
+++ conga/make/version.in 2007/12/06 03:03:40 1.21.2.28
@@ -1,5 +1,5 @@
VERSION=0.10.0
-RELEASE=6
+RELEASE=5
# Remove "_UNRELEASED" at release time.
# Put release num at the beggining,
# so that after it gets released, it has
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Cluster-devel] conga ./clustermon.spec.in.in make/version.in
@ 2008-01-02 22:45 rmccabe
0 siblings, 0 replies; 6+ messages in thread
From: rmccabe @ 2008-01-02 22:45 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL4
Changes by: rmccabe at sourceware.org 2008-01-02 22:45:33
Modified files:
. : clustermon.spec.in.in
make : version.in
Log message:
fix 426189: Conga attempts to free a null pointer
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.25.2.9&r2=1.25.2.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.28.2.8&r2=1.28.2.9
--- conga/clustermon.spec.in.in 2007/11/02 05:44:33 1.25.2.9
+++ conga/clustermon.spec.in.in 2008/01/02 22:45:31 1.25.2.10
@@ -195,6 +195,10 @@
%changelog
+* Wed Jan 02 2008 Ryan McCabe <rmccabe@redhat.com> 0.11.0-4
+- Fix bz426189 (Conga attempts to free a null pointer)
+- Resolves: bz426189
+
* Mon Oct 22 2007 Ryan McCabe <rmccabe@redhat.com> 0.11.0-3
- Fix bz334441 (Can't get cluster-snmp (fully) working)
- Resolves: bz334441
--- conga/make/version.in 2007/10/20 01:49:39 1.28.2.8
+++ conga/make/version.in 2008/01/02 22:45:33 1.28.2.9
@@ -1,5 +1,5 @@
VERSION=0.11.0
-RELEASE=3
+RELEASE=4
# Remove "_UNRELEASED" at release time.
# Put release num at the beggining,
# so that after it gets released, it has
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Cluster-devel] conga ./clustermon.spec.in.in make/version.in
@ 2008-01-21 23:17 rmccabe
0 siblings, 0 replies; 6+ messages in thread
From: rmccabe @ 2008-01-21 23:17 UTC (permalink / raw)
To: cluster-devel.redhat.com
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 <rmccabe@redhat.com> 0.10.0-5.1
-* Fixed bz368341 (Conga displays quorum status incorrectly when qdisk is used)
+* Mon Jan 21 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.0-1
+* Fixed bz317541 (Conga displays quorum status incorrectly when qdisk is used)
* Mon Aug 20 2007 Ryan McCabe <rmccabe@redhat.com> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Cluster-devel] conga ./clustermon.spec.in.in make/version.in
@ 2008-03-28 1:15 rmccabe
0 siblings, 0 replies; 6+ messages in thread
From: rmccabe @ 2008-03-28 1:15 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2008-03-28 01:15:16
Modified files:
. : clustermon.spec.in.in
make : version.in
Log message:
Fix bz439186
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.18.2.34&r2=1.18.2.35
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.35&r2=1.21.2.36
--- conga/clustermon.spec.in.in 2008/03/24 18:13:58 1.18.2.34
+++ conga/clustermon.spec.in.in 2008/03/28 01:15:16 1.18.2.35
@@ -40,11 +40,8 @@
%if %{virt_support}
BuildRequires: libvirt-devel
-Requires: libvirt
%endif
-Requires: libxml2
-
%description
This package contains Red Hat Enterprise Linux Cluster Suite
SNMP/CIM module/agent/provider.
@@ -214,6 +211,9 @@
%changelog
+* Thu Mar 27 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.0-7
+- Fix bz439186
+
* Wed Mar 19 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.0-6
- Fix bz206570 (RFE: vm list from ricci)
--- conga/make/version.in 2008/02/27 20:22:49 1.21.2.35
+++ conga/make/version.in 2008/03/28 01:15:16 1.21.2.36
@@ -1,2 +1,2 @@
VERSION=0.12.0
-RELEASE=6
+RELEASE=7
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-03-28 1:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-02 22:45 [Cluster-devel] conga ./clustermon.spec.in.in make/version.in rmccabe
-- strict thread matches above, loose matches on Subject: below --
2008-03-28 1:15 rmccabe
2008-01-21 23:17 rmccabe
2007-12-06 3:03 rmccabe
2007-12-04 21:13 rmccabe
2006-08-17 19:12 kupcevic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).