From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 3 May 2007 19:55:12 -0000
Subject: [Cluster-devel] conga clustermon.spec.in.in conga.spec.in.in
Message-ID: <20070503195512.20720.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
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
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