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

[kupcevic@sourceware.org <kupcevic@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-06-30 22:12:34

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

Log message:
	towards FC compliant specfile: Requires & Provides

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.11&r2=1.12

--- conga/conga.spec.in.in	2006/06/28 21:42:43	1.11
+++ conga/conga.spec.in.in	2006/06/30 22:12:34	1.12
@@ -79,11 +79,9 @@
 Group: System Environment/Base
 Summary: Conga Remote Management System - Management Station (https frontend)
 Requires: chkconfig initscripts
-Requires: /bin/bash
 Requires: python zope plone
 Requires: openssl mailcap stunnel
-Requires: ricci 
-Provides: luci 
+Requires: ricci = %{version}-%{release}
 
 
 %description -n luci
@@ -167,30 +165,26 @@
 Group: System Environment/Base
 Summary: Conga Remote Management System - Managed Station (dispatcher daemon, including basic management modules)
 Requires: chkconfig initscripts
-Requires: /bin/bash
-Requires: oddjob dbus libxml2 openssl pam
-Requires: ricci = %{version}-%{release}
-Requires: ricci-modrpm = %{version}-%{release}
-Requires: ricci-modstorage = %{version}-%{release}
-Requires: ricci-modservice = %{version}-%{release}
-Requires: ricci-modlog = %{version}-%{release}
+Requires: oddjob dbus openssl pam
+Requires: sed
 Requires: ricci-modcluster = %{version}-%{release}
 
-Provides: ricci ricci-modreboot 
+# modreboot
+Provides: ricci-modreboot = %{version}-%{release}
 
 # modrpm
-Provides: ricci-modrpm 
+Provides: ricci-modrpm = %{version}-%{release}
 
 # modstorage
 Requires: parted
-Provides: ricci-modstorage
+Provides: ricci-modstorage = %{version}-%{release}
 
 # modservice
 Requires: chkconfig initscripts
-Provides: ricci-modservice
+Provides: ricci-modservice = %{version}-%{release}
 
 # modlog
-Provides: ricci-modlog
+Provides: ricci-modlog = %{version}-%{release}
 
 %description -n ricci
 Conga is a project developing management system for remote stations. 
@@ -252,9 +246,9 @@
 fi
 /bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
 /sbin/service oddjobd reload > /dev/null 2>&1
-RUNS=(`runlevel`)
+RUNS=(`/sbin/runlevel`)
 RUNLEVEL=${RUNS[1]}
-STATE=`chkconfig --list ricci | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
+STATE=`/sbin/chkconfig --list ricci | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
 if [ $STATE = "on" ]; then
    /sbin/service ricci restart > /dev/null 2>&1
 fi
@@ -269,9 +263,9 @@
 /bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
 /sbin/service oddjobd reload > /dev/null 2>&1
 if [ "$1" -ge "1" ]; then
-   RUNS=(`runlevel`)
+   RUNS=(`/sbin/runlevel`)
    RUNLEVEL=${RUNS[1]}
-   STATE=`chkconfig --list ricci | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
+   STATE=`/sbin/chkconfig --list ricci | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
    if [ $STATE = "on" ]; then
       /sbin/service ricci restart > /dev/null 2>&1
    fi
@@ -288,9 +282,8 @@
 Group: System Environment/Base
 Summary: Conga Remote Management System - Managed Clustered Station (cluster management module)
 Requires: chkconfig initscripts
-Requires: /bin/bash
-Requires: oddjob libxml2 openssl
-Provides: ricci-modcluster
+Requires: oddjob openssl
+Requires: sed
 Conflicts: clumon
 
 %description -n ricci-modcluster
@@ -315,9 +308,9 @@
 /sbin/chkconfig --add ricci-modclusterd
 /bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
 /sbin/service oddjobd reload > /dev/null 2>&1
-RUNS=(`runlevel`)
+RUNS=(`/sbin/runlevel`)
 RUNLEVEL=${RUNS[1]}
-STATE=`chkconfig --list ricci-modclusterd | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
+STATE=`/sbin/chkconfig --list ricci-modclusterd | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
 if [ "$STATE" = "on" ]; then
    /sbin/service ricci-modclusterd restart > /dev/null 2>&1
 fi
@@ -345,10 +338,9 @@
 %package -n cluster-snmp
 Group: System Environment/Base
 Summary: Red Hat Enterprise Linux Cluster Suite - SNMP agent
-Requires: /bin/bash
-Requires: net-snmp ricci-modcluster
-Requires: oddjob libxml2 openssl
-Provides: cluster-snmp
+Requires: ricci-modcluster = %{version}-%{release}
+Requires: net-snmp 
+Requires: oddjob openssl
 Conflicts: clumon-snmp
 
 %description -n cluster-snmp
@@ -362,6 +354,7 @@
 			%{_docdir}/cluster-snmp-%{version}/
 
 %pre -n cluster-snmp
+exit 0
 
 %post -n cluster-snmp
 #/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
@@ -370,6 +363,7 @@
 exit 0
 
 %preun -n cluster-snmp
+exit 0
 
 %postun -n cluster-snmp
 #/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
@@ -387,10 +381,9 @@
 %package -n cluster-cim
 Group: System Environment/Base
 Summary: Red Hat Enterprise Linux Cluster Suite - CIM provider
-Requires: /bin/bash
-Requires: tog-pegasus ricci-modcluster
-Requires: oddjob libxml2 openssl
-Provides: cluster-cim
+Requires: ricci-modcluster = %{version}-%{release}
+Requires: tog-pegasus 
+Requires: oddjob openssl
 Conflicts: clumon-cim
 
 %description -n cluster-cim
@@ -402,6 +395,7 @@
 %{_docdir}/cluster-cim-%{version}/
 
 %pre -n cluster-cim
+exit 0
 
 %post -n cluster-cim
 #/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
@@ -410,6 +404,7 @@
 exit 0
 
 %preun -n cluster-cim
+exit 0
 
 %postun -n cluster-cim
 #/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`