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

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-04-11 21:12:43

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

Log message:
	fix changelogs

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.18.2.14&r2=1.18.2.15
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.32&r2=1.45.2.33

--- conga/clustermon.spec.in.in	2007/04/11 19:23:51	1.18.2.14
+++ conga/clustermon.spec.in.in	2007/04/11 20:12:43	1.18.2.15
@@ -195,14 +195,16 @@
 %changelog
 
 * Wed Apr 11 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.2-5
+- Version bump
+- Related: bz229027, bz230447, bz230452, bz230454, bz230457,
+- Related: bz230461, bz230469, bz228637, bz233326, bz225747,
+- Related: bz225206, bz225164, bz227758
+
+* Wed Mar 28 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.9.2-4
 - Do not fail on i18n machines
 - Fixed bz225747 (Create/delete cluster - then access disk on node = Generic error on host: cluster tools: cman_tool errored)
 - Fixed bz230454 (Unable to configure a virtual service)
-- Resolves: bz225747
-- Related: bz229027, bz230447, bz230452, bz230454, bz230457,
-- Related: bz230469, bz228637, bz233326, bz225747, bz225206,
-- Related: bz230461, bz225164, bz227758
-
+- Resolves: bz225747, bz230454
 
 * Tue Jan 23 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.8-30
 - Version bump
--- conga/conga.spec.in.in	2007/04/11 19:23:51	1.45.2.32
+++ conga/conga.spec.in.in	2007/04/11 20:12:43	1.45.2.33
@@ -283,6 +283,12 @@
 %changelog
 
 * Wed Apr 11 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.2-5
+- Fixed bz225206 (Cluster cannot be deleted (from 'Manage Systems') - but no error results)
+- Fixed bz225164 (Conga allows creation/rename of clusters with name greater than 15 characters)
+- Fixed bz227758 (Entering bad password when creating a new cluster = UnboundLocalError: local variable 'e' referenced before assignment)
+- Resolves: bz225206, bz225164, bz227758
+
+* Wed Mar 28 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.9.2-4
 - Do not fail on i18n machines
 - Fixed bz225747 (Create/delete cluster - then access disk on node = Generic error on host: cluster tools: cman_tool errored)
 - Fixed bz233326 (CVE-2007-0240 Conga includes version of Zope that is vulnerable to a XSS attack)
@@ -294,12 +300,8 @@
 - Fixed bz230457 (kmod-gfs-xen not installed with Conga install)
 - Fixed bz230461 ('enable shared storage' option cleared whenever there is a configuration error)
 - Fixed bz230469 (Must manually edit cluster.conf on the dom0 cluster to add "<fence_xvmd/>")
-- Fixed bz225206 (Cluster cannot be deleted (from 'Manage Systems') - but no error results)
-- Fixed bz225164 (Conga allows creation/rename of clusters with name greater than 15 characters)
-- Fixed bz227758 (Entering bad password when creating a new cluster = UnboundLocalError: local variable 'e' referenced before assignment)
 - Resolves: bz229027, bz230447, bz230452, bz230454, bz230457,
-- Resolves: bz230469, bz228637, bz233326, bz225206, bz227758,
-- Resolves: bz230461, bz225164
+- Resolves: bz230461, bz230469, bz228637, bz233326, bz225747
 
 * Tue Jan 23 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.8-30
 - Fixed bz212445 (release blocker: prevent management page access)

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL50_Z_branchpoint
Changes by:	rmccabe at sourceware.org	2007-04-12 20:56:44

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

Log message:
	changelog update

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL50_Z_branchpoint&r1=1.18.2.12.2.1&r2=1.18.2.12.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL50_Z_branchpoint&r1=1.45.2.24.2.1&r2=1.45.2.24.2.2

--- conga/clustermon.spec.in.in	2007/04/12 17:19:18	1.18.2.12.2.1
+++ conga/clustermon.spec.in.in	2007/04/12 19:56:44	1.18.2.12.2.2
@@ -196,6 +196,9 @@
 
 * Thu Apr 12 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.2-6
 - Fixed bz236023 (Create/delete cluster - then access disk on node = Generic error on host: cluster tools: cman_tool errored)
+- Resolves: bz236023
+- Related: bz233326, bz228637, bz236020, bz236021, bz236025, bz236026,
+- Related: bz236027, bz236048, bz236050, bz236052, bz236054, bz236055
 
 * Tue Jan 23 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.8-30
 - Version bump
--- conga/conga.spec.in.in	2007/04/12 17:19:18	1.45.2.24.2.1
+++ conga/conga.spec.in.in	2007/04/12 19:56:44	1.45.2.24.2.2
@@ -295,6 +295,9 @@
 - Fixed bz236052 (kmod-gfs-xen not installed with Conga install)
 - Fixed bz236054 (enable shared storage' option cleared whenever there is a configuration error)
 - Fixed bz236055 (Must manually edit cluster.conf on the dom0 cluster to add "<fence_xvmd/>")
+- Resolves: bz233326, bz228637, bz236020, bz236021, bz236025, bz236026,
+- Resolves: bz236027, bz236048, bz236050, bz236052, bz236054, bz236055
+- Related: bz236023
 
 * Tue Jan 23 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.8-30
 - Fixed bz212445 (release blocker: prevent management page access)

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-04-25 19:08:43

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

Log message:
	Fix 237838: modcluster and ricci scriptlets fail during install

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.25.2.3&r2=1.25.2.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.7&r2=1.67.2.8

--- conga/clustermon.spec.in.in	2007/03/20 20:52:52	1.25.2.3
+++ conga/clustermon.spec.in.in	2007/04/25 18:08:42	1.25.2.4
@@ -88,10 +88,10 @@
 
 
 %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
 /sbin/service oddjobd reload > /dev/null 2>&1
+/sbin/chkconfig --add modclusterd
 
 %preun -n modcluster
 if [ "$1" == "0" ]; then
@@ -138,6 +138,7 @@
 
 %post -n cluster-snmp
 /sbin/service snmpd condrestart > /dev/null 2>&1
+exit 0
 
 %postun -n cluster-snmp
 # don't restart snmpd twice on upgrades
@@ -194,6 +195,9 @@
 
 
 %changelog
+* Wed Apr 25 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.1-7
+- Fixed bz237838 (modcluster and ricci scriptlets fail during install)
+- Resolves: bz237838
 
 * Tue Mar 20 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.9.1-6
 - Do not fail on i18n machines
--- conga/conga.spec.in.in	2007/03/27 17:14:45	1.67.2.7
+++ conga/conga.spec.in.in	2007/04/25 18:08:42	1.67.2.8
@@ -257,10 +257,10 @@
 fi
 
 %post -n ricci
-/sbin/chkconfig --add ricci
 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
+/sbin/chkconfig --add ricci
 
 %preun -n ricci
 if [ "$1" == "0" ]; then
@@ -289,8 +289,10 @@
 
 %changelog
 
-* Tue Mar 27 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.9.1-7
+* Wed Apr 25 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.1-7
 - Fixed bz234196 (CVE-2007-0240 Conga includes version of Zope that is vulnerable to a XSS attack)
+- Fixed bz237838 (modcluster and ricci scriptlets fail during install)
+- Related: bz237838
 - Resolves: bz234196
 
 * Tue Mar 20 2007 Stanko Kupcevic <kupcevic@redhat.com> 0.9.1-6

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-04-30 19:47:32

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

Log message:
	spec file cleanups to make tests using grep against /etc/{passwd,group} more strict, and to avoid harmless failure messages in %post

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.18.2.16&r2=1.18.2.17
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.34&r2=1.45.2.35

--- conga/clustermon.spec.in.in	2007/04/11 20:15:31	1.18.2.16
+++ conga/clustermon.spec.in.in	2007/04/30 18:47:32	1.18.2.17
@@ -91,7 +91,8 @@
 /sbin/chkconfig --add modclusterd
 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
+# It's ok if this fails (it will fail when oddjob is not running).
+/sbin/service oddjobd reload > /dev/null 2>&1 || true
 
 %preun -n modcluster
 if [ "$1" == "0" ]; then
@@ -137,7 +138,7 @@
 			%{_docdir}/cluster-snmp-%{version}/
 
 %post -n cluster-snmp
-/sbin/service snmpd condrestart > /dev/null 2>&1
+/sbin/service snmpd condrestart > /dev/null 2>&1 || true
 
 %postun -n cluster-snmp
 # don't restart snmpd twice on upgrades
@@ -172,9 +173,8 @@
 			%{_docdir}/cluster-cim-%{version}/
 
 %post -n cluster-cim
-/sbin/service tog-pegasus condrestart > /dev/null 2>&1
 # pegasus might not be running, don't fail %post
-exit 0
+/sbin/service tog-pegasus condrestart > /dev/null 2>&1 || true
 
 %postun -n cluster-cim
 # don't restart pegasus twice on upgrades
@@ -194,12 +194,13 @@
 
 %changelog
 
-* Wed Apr 11 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.2-7
+* Mon Apr 30 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.2-7
 
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXX UPDATE NOT RELEASED YET XXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 
+
 * Wed Apr 11 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.2-5
 - Version bump
 - Related: bz229027, bz230447, bz230452, bz230454, bz230457,
--- conga/conga.spec.in.in	2007/04/11 20:15:31	1.45.2.34
+++ conga/conga.spec.in.in	2007/04/30 18:47:32	1.45.2.35
@@ -131,10 +131,10 @@
 %endif
 
 %pre -n luci
-if ! /bin/grep luci\:x /etc/group 2>&1 >/dev/null; then
+if ! /bin/grep ^luci\:x /etc/group 2>&1 >/dev/null; then
    /usr/sbin/groupadd -r -f luci >/dev/null 2>&1
 fi
-if ! /bin/grep luci\:x /etc/passwd 2>&1 >/dev/null; then
+if ! /bin/grep ^luci\:x /etc/passwd 2>&1 >/dev/null; then
    /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >/dev/null 2>&1
 fi
 
@@ -244,18 +244,18 @@
 			%{_libexecdir}/ricci-modlog
 
 %pre -n ricci
-if ! /bin/grep ricci\:x /etc/group 2>&1 >/dev/null; then
+if ! /bin/grep ^ricci\:x /etc/group 2>&1 >/dev/null; then
    /usr/sbin/groupadd -r -f ricci >/dev/null 2>&1
 fi
-if ! /bin/grep ricci\:x /etc/passwd 2>&1 >/dev/null; then
+if ! /bin/grep ^ricci\:x /etc/passwd 2>&1 >/dev/null; then
    /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >/dev/null 2>&1
 fi
 
 %post -n ricci
-/sbin/chkconfig --add ricci
 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
+/sbin/chkconfig --add ricci
 
 %preun -n ricci
 if [ "$1" == "0" ]; then
@@ -282,7 +282,7 @@
 
 %changelog
 
-* Wed Apr 11 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.2-7
+* Mon Apr 30 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.2-7
 
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 XXXXXXXXXXXXXXXXXXX UPDATE NOT RELEASED YET XXXXXXXXXXXXXXXXXXX

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-05-03 19:55:11

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

Log message:
	sync up the specfiles from the RHEL5 branch

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&r1=1.29&r2=1.30
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.76&r2=1.77

--- conga/clustermon.spec.in.in	2007/03/21 16:55:15	1.29
+++ conga/clustermon.spec.in.in	2007/05/03 19:55:10	1.30
@@ -91,7 +91,8 @@
 /sbin/chkconfig --add modclusterd
 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
+# It's ok if this fails (it will fail when oddjob is not running).
+/sbin/service oddjobd reload > /dev/null 2>&1 || true
 
 %preun -n modcluster
 if [ "$1" == "0" ]; then
@@ -137,7 +138,7 @@
 			%{_docdir}/cluster-snmp-%{version}/
 
 %post -n cluster-snmp
-/sbin/service snmpd condrestart > /dev/null 2>&1
+/sbin/service snmpd condrestart > /dev/null 2>&1 || true
 
 %postun -n cluster-snmp
 # don't restart snmpd twice on upgrades
@@ -172,9 +173,8 @@
 			%{_docdir}/cluster-cim-%{version}/
 
 %post -n cluster-cim
-/sbin/service tog-pegasus condrestart > /dev/null 2>&1
 # pegasus might not be running, don't fail %post
-exit 0
+/sbin/service tog-pegasus condrestart > /dev/null 2>&1 || true
 
 %postun -n cluster-cim
 # don't restart pegasus twice on upgrades
--- conga/conga.spec.in.in	2007/03/27 02:17:16	1.76
+++ conga/conga.spec.in.in	2007/05/03 19:55:10	1.77
@@ -40,7 +40,7 @@
 BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
 #BuildRequires: pam-devel
 BuildRequires: cyrus-sasl-devel >= 2.1
-BuildRequires: openssl-devel dbus-devel pkgconfig file-devel
+BuildRequires: openssl-devel dbus-devel pkgconfig file
 
 
 %description
@@ -91,13 +91,13 @@
 Summary: Remote Management System - Management Station
 
 Requires: chkconfig initscripts
-%if "%{include_zope_and_plone}" == "yes"
 Requires: python >= 2.4.1
+%if "%{include_zope_and_plone}" == "yes"
 Provides: config(luci) = %{version}-%{release}
+# don't provide zope internals
 AutoProv: no
 %else
 AutoProv: yes
-Requires: python
 Requires: zope
 Requires: plone >= 2.5
 %endif
@@ -131,10 +131,10 @@
 %endif
 
 %pre -n luci
-if ! /bin/grep luci\:x /etc/group 2>&1 >/dev/null; then
+if ! /bin/grep ^luci\:x /etc/group 2>&1 >/dev/null; then
    /usr/sbin/groupadd -r -f luci >/dev/null 2>&1
 fi
-if ! /bin/grep luci\:x /etc/passwd 2>&1 >/dev/null; then
+if ! /bin/grep ^luci\:x /etc/passwd 2>&1 >/dev/null; then
    /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >/dev/null 2>&1
 fi
 
@@ -193,7 +193,7 @@
 # modrpm
 
 # modstorage
-Requires: parted util-linux file
+Requires: parted util-linux
 
 # modservice
 Requires: chkconfig initscripts
@@ -244,18 +244,18 @@
 			%{_libexecdir}/ricci-modlog
 
 %pre -n ricci
-if ! /bin/grep ricci\:x /etc/group 2>&1 >/dev/null; then
+if ! /bin/grep ^ricci\:x /etc/group 2>&1 >/dev/null; then
    /usr/sbin/groupadd -r -f ricci >/dev/null 2>&1
 fi
-if ! /bin/grep ricci\:x /etc/passwd 2>&1 >/dev/null; then
+if ! /bin/grep ^ricci\:x /etc/passwd 2>&1 >/dev/null; then
    /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >/dev/null 2>&1
 fi
 
 %post -n ricci
-/sbin/chkconfig --add ricci
 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
+/sbin/chkconfig --add ricci
 
 %preun -n ricci
 if [ "$1" == "0" ]; then

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-07-16 21:11:18

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

Log message:
	Insure correct permissions are set on %{_libdir}/luci when installing from rpm.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&r1=1.30&r2=1.31
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.78&r2=1.79

--- conga/clustermon.spec.in.in	2007/05/03 19:55:10	1.30
+++ conga/clustermon.spec.in.in	2007/07/16 21:11:18	1.31
@@ -34,7 +34,7 @@
 BuildRequires: net-snmp-devel tog-pegasus-devel
 
 %description
-This package contains Red Hat Enterprise Linux Cluster Suite 
+This package contains Red Hat Enterprise Linux Cluster Suite
 SNMP/CIM module/agent/provider.
 
 
@@ -42,7 +42,7 @@
 %setup -q
 
 %build
-%configure      --arch=%{_arch} \
+%configure		--arch=%{_arch} \
 		--docdir=%{_docdir} \
 		--pegasus_providers_dir=%{PEGASUS_PROVIDERS_DIR} \
 		--include_zope_and_plone=no
@@ -96,18 +96,18 @@
 
 %preun -n modcluster
 if [ "$1" == "0" ]; then
-   /sbin/service modclusterd stop > /dev/null 2>&1
-   /sbin/chkconfig --del modclusterd
+	/sbin/service modclusterd stop > /dev/null 2>&1
+	/sbin/chkconfig --del modclusterd
 fi
 
 %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
+	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
 fi
 if [ "$1" == "1" ]; then
-   /sbin/service modclusterd condrestart > /dev/null 2>&1
+	/sbin/service modclusterd condrestart > /dev/null 2>&1
 fi
 
 
@@ -121,7 +121,7 @@
 Summary: Red Hat Enterprise Linux Cluster Suite - SNMP agent
 
 Requires: modcluster = %{version}-%{release}
-Requires: net-snmp 
+Requires: net-snmp
 Requires: oddjob openssl
 Requires(post): initscripts
 Requires(postun): initscripts
@@ -143,7 +143,7 @@
 %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 2>&1
 fi
 
 
@@ -158,14 +158,14 @@
 Summary: Red Hat Enterprise Linux Cluster Suite - CIM provider
 
 Requires: modcluster = %{version}-%{release}
-Requires: tog-pegasus 
+Requires: tog-pegasus
 Requires: oddjob openssl
 Requires(post): initscripts
 Requires(postun): initscripts
 Conflicts: clumon-cim
 
 %description -n cluster-cim
-CIM provider for Red Hat Enterprise Linux Cluster Suite. 
+CIM provider for Red Hat Enterprise Linux Cluster Suite.
 
 %files -n cluster-cim
 %defattr(-,root,root)
@@ -179,7 +179,7 @@
 %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 2>&1
 fi
 # pegasus might not be running, don't fail %postun
 exit 0
--- conga/conga.spec.in.in	2007/06/25 16:03:37	1.78
+++ conga/conga.spec.in.in	2007/07/16 21:11:18	1.79
@@ -11,7 +11,7 @@
 ###############################################################################
 
 
-%define include_zope_and_plone     @@INCLUDE_ZOPE_AND_PLONE@@
+%define include_zope_and_plone	@@INCLUDE_ZOPE_AND_PLONE@@
 
 
 
@@ -38,15 +38,15 @@
 
 BuildRequires: python-devel >= 2.4.1
 BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
-#BuildRequires: pam-devel
+BuildRequires: cman-devel
 BuildRequires: cyrus-sasl-devel >= 2.1
 BuildRequires: openssl-devel dbus-devel pkgconfig file
 
 
 %description
-Conga is a project developing management system for remote stations. 
-It consists of luci, https frontend, and ricci, secure daemon that dispatches 
-incoming messages to underlying management modules. 
+Conga is a project developing management system for remote stations.
+It consists of luci, https frontend, and ricci, secure daemon that dispatches
+incoming messages to underlying management modules.
 
 
 %prep
@@ -64,7 +64,7 @@
 %endif
 
 %build
-%configure      --arch=%{_arch} \
+%configure		--arch=%{_arch} \
 		--docdir=%{_docdir} \
 		--include_zope_and_plone=%{include_zope_and_plone}
 make %{?_smp_mflags} conga
@@ -101,7 +101,7 @@
 Requires: zope
 Requires: plone >= 2.5
 %endif
-Requires: grep openssl mailcap stunnel 
+Requires: grep openssl mailcap stunnel
 Requires: sed util-linux
 
 Requires(pre): grep shadow-utils
@@ -110,9 +110,9 @@
 
 
 %description -n luci
-Conga is a project developing management system for remote stations. 
-It consists of luci, https frontend, and ricci, secure daemon that 
-dispatches incoming messages to underlying management modules. 
+Conga is a project developing management system for remote stations.
+It consists of luci, https frontend, and ricci, secure daemon that
+dispatches incoming messages to underlying management modules.
 
 This package contains Luci website.
 
@@ -123,6 +123,8 @@
 				%{_sysconfdir}/rc.d/init.d/luci
 				%{_sbindir}/luci_admin
 				%{_docdir}/luci-%{version}/
+%defattr(0755,root,root)
+				%{_libdir}/luci/
 %defattr(-,luci,luci)
 				%{_localstatedir}/lib/luci
 				%{_libdir}/luci/ssl
@@ -132,10 +134,10 @@
 
 %pre -n luci
 if ! /bin/grep ^luci\:x /etc/group >&/dev/null; then
-   /usr/sbin/groupadd -r -f luci >&/dev/null
+	/usr/sbin/groupadd -r -f luci >&/dev/null
 fi
 if ! /bin/grep ^luci\:x /etc/passwd >&/dev/null; then
-   /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >&/dev/null
+	/usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >&/dev/null
 fi
 
 %post -n luci
@@ -143,36 +145,37 @@
 /sbin/service luci status >&/dev/null
 LUCI_RUNNING=$?
 if [ "$LUCI_RUNNING" == "0" ]; then
-   /sbin/service luci stop >&/dev/null
+	/sbin/service luci stop >&/dev/null
 fi
 if [ -f /var/lib/luci/var/luci_backup.xml ]; then
-   # restore luci database
-   /usr/sbin/luci_admin restore >&/dev/null
+	# restore luci database
+	/usr/sbin/luci_admin restore >&/dev/null
 fi
 
 # set initial admin password (if not already set) to random value
 grep True /var/lib/luci/.default_password_has_been_reset >&/dev/null
 if [ $? -ne 0 ]; then
-   /usr/sbin/luci_admin password --random >&/dev/null &&
-   rm -f /var/lib/luci/var/Data.fs.index /var/lib/luci/var/Data.fs.tmp /var/lib/luci/var/Data.fs.old
+	/usr/sbin/luci_admin password --random >&/dev/null &&
+		rm -f /var/lib/luci/var/Data.fs.index /var/lib/luci/var/Data.fs.tmp /var/lib/luci/var/Data.fs.old
+	find %{_libdir}/luci/zope/var -print0 2>/dev/null | xargs -0 chown luci:
 fi
 if [ "$LUCI_RUNNING" == "0" ]; then
-   /sbin/service luci start >&/dev/null
+	/sbin/service luci start >&/dev/null
 fi
 
 %preun -n luci
 if [ "$1" == "0" ]; then
-   /sbin/service luci stop >&/dev/null
-   /sbin/chkconfig --del luci
+	/sbin/service luci stop >&/dev/null
+	/sbin/chkconfig --del luci
 fi
 /sbin/service luci status >&/dev/null
 LUCI_RUNNING=$?
 if [ "$LUCI_RUNNING" == "0" ]; then
-   /sbin/service luci stop >&/dev/null
+	/sbin/service luci stop >&/dev/null
 fi
 /usr/sbin/luci_admin backup >&/dev/null
 if [ "$LUCI_RUNNING" == "0" ]; then
-   /sbin/service luci start >&/dev/null
+	/sbin/service luci start >&/dev/null
 fi
 
 
@@ -210,12 +213,12 @@
 Requires(postun): initscripts util-linux
 
 %description -n ricci
-Conga is a project developing management system for remote stations. 
-It consists of luci, https frontend, and ricci, secure daemon that dispatches 
-incoming messages to underlying management modules. 
+Conga is a project developing management system for remote stations.
+It consists of luci, https frontend, and ricci, secure daemon that dispatches
+incoming messages to underlying management modules.
 
-This package contains listening daemon (dispatcher), as well as 
-reboot, rpm, storage, service and log management modules. 
+This package contains listening daemon (dispatcher), as well as
+reboot, rpm, storage, service and log management modules.
 
 
 %files -n ricci
@@ -248,10 +251,10 @@
 
 %pre -n ricci
 if ! /bin/grep ^ricci\:x /etc/group >&/dev/null; then
-   /usr/sbin/groupadd -r -f ricci >&/dev/null
+	/usr/sbin/groupadd -r -f ricci >&/dev/null
 fi
 if ! /bin/grep ^ricci\:x /etc/passwd >&/dev/null; then
-   /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >&/dev/null
+	/usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >&/dev/null
 fi
 
 %post -n ricci
@@ -262,18 +265,18 @@
 
 %preun -n ricci
 if [ "$1" == "0" ]; then
-   /sbin/service ricci stop >&/dev/null
-   /sbin/chkconfig --del ricci
+	/sbin/service ricci stop >&/dev/null
+	/sbin/chkconfig --del ricci
 fi
 
 %postun -n ricci
 if [ "$1" == "0" ]; then
-   DBUS_PID=`cat /var/run/messagebus.pid 2>/dev/null`
-   /bin/kill -s SIGHUP $DBUS_PID >&/dev/null
-   /sbin/service oddjobd reload >&/dev/null
+	DBUS_PID=`cat /var/run/messagebus.pid 2>/dev/null`
+	/bin/kill -s SIGHUP $DBUS_PID >&/dev/null
+	/sbin/service oddjobd reload >&/dev/null
 fi
 if [ "$1" == "1" ]; then
-   /sbin/service ricci condrestart >&/dev/null
+	/sbin/service ricci condrestart >&/dev/null
 fi
 
 

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-07-30 06:13:31

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

Log message:
	Update changelogs

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.18.2.20&r2=1.18.2.21
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.48&r2=1.45.2.49

--- conga/clustermon.spec.in.in	2007/07/16 21:06:14	1.18.2.20
+++ conga/clustermon.spec.in.in	2007/07/30 06:13:31	1.18.2.21
@@ -194,6 +194,9 @@
 
 %changelog
 
+* Mon Jul 30 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-3
+- Fixed bz249351 (conga reports that ricci agent is unresponsive even though it's running)
+
 * Wed Jun 27 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-1
 - Performance improvements.
 - Make the clustermon init script more LSB-compliant
--- conga/conga.spec.in.in	2007/07/18 18:57:19	1.45.2.48
+++ conga/conga.spec.in.in	2007/07/30 06:13:31	1.45.2.49
@@ -285,6 +285,17 @@
 
 
 ###  changelog ###
+%changelog
+* Mon Jul 30 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-3
+- Fixed bz245947 (luci/Conga cluster configuration tool not initializing cluster node members)
+- Fixed bz249641 (conga is unable to do storage operations if there is an lvm snapshot present)
+- Fixed bz249342 (unknown ricci error when adding new node to cluster)
+- Fixed bz249291 (delete node task fails to do all items listed in the help document)
+- Fixed bz249091 (RFE: tell user they are about to kill all their nodes)
+- Fixed bz249066 (AttributeError when attempting to configure a fence device)
+- Fixed bz249086 (Unable to add a new fence device to cluster)
+- Fixed bz249868 (Use of failover domain not correctly shown)
+- Related: bz249351
 
 %changelog
 * Wed Jul 18 2007 Ryan McCabe <rmccabe@redhat.com> 0.10.0-2

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-08-09 22:34:59

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

Log message:
	Update changelogs

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.25.2.6&r2=1.25.2.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.67.2.12&r2=1.67.2.13

--- conga/clustermon.spec.in.in	2007/08/09 22:02:19	1.25.2.6
+++ conga/clustermon.spec.in.in	2007/08/09 22:34:58	1.25.2.7
@@ -197,6 +197,8 @@
 %changelog
 * Thu Aug 09 2007 Ryan McCabe <rmccabe@redhat.com> 0.11.0-1
 - Merge in fixes from the RHEL5 code base.
+- Fix bz241417 (Conga tries to configurage cluster snaps, though they are not available.)
+- Resolves: bz241417
 
 * Tue Apr 30 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.1-8
 - Do not build for ppc64
--- conga/conga.spec.in.in	2007/08/09 22:02:19	1.67.2.12
+++ conga/conga.spec.in.in	2007/08/09 22:34:58	1.67.2.13
@@ -297,6 +297,13 @@
 %changelog
 * Thu Aug 09 2007 Ryan McCabe <rmccabe@redhat.com> 0.11.0-1
 - Merge in fixes from the RHEL5 code base.
+- Fix bz238727 (Conga provides no way to remove a dead node from a cluster)
+- Fix bz241414 (Installation using Conga shows "error" in message during reboot cycle.)
+- Fix bz238656 (conga does not set the "nodename" attribute for manual fencing)
+- Fix bz245200 (Conga needs to support Internet Explorer 6.0 and later)
+- Fix bz227723 (Entering bad password when creating a new cluster = UnboundLocalError: local variable 'e' referenced before)
+- Related: bz241417
+- Resolves: bz238727, bz241414, bz238656, bz245200, bz227723
 
 * Tue Apr 30 2007 Ryan McCabe <rmccabe@redhat.com> 0.9.1-9
 - Fix bz238656 (conga does not set the "nodename" attribute for manual fencing)

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

[rmccabe]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2008-03-19 20:10:47

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

Log message:
	clustermon should be marked as fixing the "vm list from ricci" bug, not conga

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.18.2.32&r2=1.18.2.33
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.73&r2=1.45.2.74

--- conga/clustermon.spec.in.in	2008/02/12 17:40:38	1.18.2.32
+++ conga/clustermon.spec.in.in	2008/03/19 20:10:47	1.18.2.33
@@ -27,11 +27,13 @@
 Source0: %{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: cman-devel
+BuildRequires: cman-devel libvirt-devel
 BuildRequires: glibc-devel gcc-c++ libxml2-devel
 BuildRequires: openssl-devel dbus-devel pam-devel pkgconfig
 BuildRequires: net-snmp-devel tog-pegasus-devel
 
+Requires: libvirt libxml2
+
 %description
 This package contains Red Hat Enterprise Linux Cluster Suite
 SNMP/CIM module/agent/provider.
@@ -193,6 +195,9 @@
 
 
 %changelog
+* Wed Mar 19 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.0-6
+- Fix bz206570 (RFE: vm list from ricci)
+
 * Tue Feb 12 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.0-5
 - Fix bz432534 (clustermon should not attempt to start or stop the cmirror service)
 
--- conga/conga.spec.in.in	2008/03/19 14:59:41	1.45.2.73
+++ conga/conga.spec.in.in	2008/03/19 20:10:47	1.45.2.74
@@ -32,8 +32,7 @@
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python-devel >= 2.4.1
-BuildRequires: glibc-devel gcc-c++ libxml2-devel sed libvirt
-BuildRequires: cman-devel libvirt-devel
+BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
 BuildRequires: cyrus-sasl-devel >= 2.1
 BuildRequires: openssl-devel dbus-devel pkgconfig file
 
@@ -295,7 +294,6 @@
 * Wed Feb 27 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.0-6
 - Fix bz434586 (Resource tree does not display multiple children of a parent correctly)
 - Fix bz304931 (Rich Sybase resource agent configuration support)
-- Fix bz206570 (RFE: vm list from ricci)
 
 * Tue Feb 12 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.0-5
 - Fix bz432533 (Do not attempt to install the cmirror package when shared storage is requested)