From: kupcevic@sourceware.org <kupcevic@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga ./conga.spec.in.in make/version.in
Date: 16 Jun 2006 21:34:25 -0000 [thread overview]
Message-ID: <20060616213425.27566.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-06-16 21:34:25
Modified files:
. : conga.spec.in.in
make : version.in
Log message:
Move ricci-modstorage, ricci-modservice, ricci-modlog and ricci-modrpm into ricci.rpm. ricci-modcluster, cluster-snmp and cluster-cim remain individual rpms.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.4&r2=1.5
--- conga/conga.spec.in.in 2006/06/15 03:08:35 1.5
+++ conga/conga.spec.in.in 2006/06/16 21:34:25 1.6
@@ -76,7 +76,8 @@
Requires: /bin/bash
Requires: python zope plone
Requires: openssl mailcap stunnel
-Provides: luci
+Requires: ricci
+Provides: luci
%description -n luci
@@ -129,30 +130,43 @@
-
-################# ricci ################3
-
-
-
-### ricci base package ###
+### ricci daemon & basic modules ###
%package -n ricci
Group: System Environment/Base
-Summary: ricci
+Summary: Remote management system, including basic management modules
Requires: chkconfig initscripts
Requires: /bin/bash
Requires: oddjob dbus libxml2 openssl pam
Requires: ricci = %{version}-%{release}
-Requires: ricci-modcluster = %{version}-%{release}
+Requires: ricci-modrpm = %{version}-%{release}
Requires: ricci-modstorage = %{version}-%{release}
Requires: ricci-modservice = %{version}-%{release}
Requires: ricci-modlog = %{version}-%{release}
-Provides: ricci ricci-modreboot ricci-modrpm
+Requires: ricci-modcluster = %{version}-%{release}
+
+Provides: ricci ricci-modreboot
+
+# modrpm
+Provides: ricci-modrpm
+
+# modstorage
+Requires: parted
+Provides: ricci-modstorage
+
+# modservice
+Requires: chkconfig initscripts
+Provides: ricci-modservice
+
+# modlog
+Provides: ricci-modlog
%description -n ricci
ricci description
-This package contains reboot and rpm modules
+Remote management system.
+This package contains listening daemon, as well as reboot, rpm, storage, service and log management modules.
+
%files -n ricci
%defattr(-,root,root)
@@ -165,14 +179,28 @@
%{_sysconfdir}/dbus-1/system.d/ricci.systembus.conf
%attr(-,ricci,root) %{_localstatedir}/lib/ricci
%{_sbindir}/ricci
- %{_sbindir}/ricci-worker
%attr(4755,root,root) %{_sbindir}/ricci-auth
-
+ %{_sbindir}/ricci-worker
# modrpm
%{_sysconfdir}/oddjobd.conf.d/ricci-modrpm.oddjob.conf
%{_sysconfdir}/dbus-1/system.d/ricci-modrpm.systembus.conf
%{_sbindir}/ricci-modrpm
%{_sbindir}/ricci-modrpm.exe
+# modstorage
+ %{_sysconfdir}/oddjobd.conf.d/ricci-modstorage.oddjob.conf
+ %{_sysconfdir}/dbus-1/system.d/ricci-modstorage.systembus.conf
+ %{_sbindir}/ricci-modstorage
+ %{_sbindir}/ricci-modstorage.exe
+# modservice
+ %{_sysconfdir}/oddjobd.conf.d/ricci-modservice.oddjob.conf
+ %{_sysconfdir}/dbus-1/system.d/ricci-modservice.systembus.conf
+ %{_sbindir}/ricci-modservice
+ %{_sbindir}/ricci-modservice.exe
+# modlog
+ %{_sysconfdir}/oddjobd.conf.d/ricci-modlog.oddjob.conf
+ %{_sysconfdir}/dbus-1/system.d/ricci-modlog.systembus.conf
+ %{_sbindir}/ricci-modlog
+ %{_sbindir}/ricci-modlog.exe
%pre -n ricci
/usr/sbin/groupadd -r -f ricci >/dev/null 2>&1
@@ -208,12 +236,18 @@
/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
/sbin/service oddjobd reload > /dev/null 2>&1
if [ "$1" -ge "1" ]; then
- /sbin/service ricci condrestart > /dev/null 2>&1
+ RUNS=(`runlevel`)
+ RUNLEVEL=${RUNS[1]}
+ STATE=`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
fi
exit 0
+
### cluster module ###
@@ -224,7 +258,6 @@
Requires: /bin/bash
Requires: oddjob libxml2 openssl
Provides: ricci-modcluster
-Conflicts: ricci-cluster
Conflicts: clumon
%description -n ricci-modcluster
@@ -267,118 +300,6 @@
-### storage module ###
-
-
-%package -n ricci-modstorage
-Group: System Environment/Base
-Summary: ricci-modstorage summary
-Requires: /bin/bash
-Requires: oddjob libxml2 openssl
-Requires: parted
-Provides: ricci-modstorage
-Conflicts: ricci-storage
-
-%description -n ricci-modstorage
-ricci-modstorage description
-
-%files -n ricci-modstorage
-%defattr(-,root,root)
-#%doc README
-%{_sysconfdir}/oddjobd.conf.d/ricci-modstorage.oddjob.conf
-%{_sysconfdir}/dbus-1/system.d/ricci-modstorage.systembus.conf
-%{_sbindir}/ricci-modstorage
-%{_sbindir}/ricci-modstorage.exe
-
-%post -n ricci-modstorage
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd reload > /dev/null 2>&1
-exit 0
-
-%preun -n ricci-modstorage
-
-%postun -n ricci-modstorage
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd reload > /dev/null 2>&1
-exit 0
-
-
-
-
-### service module ###
-
-
-%package -n ricci-modservice
-Group: System Environment/Base
-Summary: ricci-modservice summary
-Requires: chkconfig initscripts
-Requires: /bin/bash
-Requires: oddjob libxml2 openssl
-Provides: ricci-modservice
-
-%description -n ricci-modservice
-ricci-modservice description
-
-%files -n ricci-modservice
-%defattr(-,root,root)
-#%doc README
-%{_sysconfdir}/oddjobd.conf.d/ricci-modservice.oddjob.conf
-%{_sysconfdir}/dbus-1/system.d/ricci-modservice.systembus.conf
-%{_sbindir}/ricci-modservice
-%{_sbindir}/ricci-modservice.exe
-
-%post -n ricci-modservice
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd reload > /dev/null 2>&1
-exit 0
-
-%preun -n ricci-modservice
-
-%postun -n ricci-modservice
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd reload > /dev/null 2>&1
-exit 0
-
-
-
-
-### logging module ###
-
-
-%package -n ricci-modlog
-Group: System Environment/Base
-Summary: ricci-modlog summary
-Requires: chkconfig initscripts
-Requires: /bin/bash
-Requires: oddjob libxml2 openssl
-Provides: ricci-modlog
-
-%description -n ricci-modlog
-ricci-modlog description
-
-%files -n ricci-modlog
-%defattr(-,root,root)
-#%doc README
-%{_sysconfdir}/oddjobd.conf.d/ricci-modlog.oddjob.conf
-%{_sysconfdir}/dbus-1/system.d/ricci-modlog.systembus.conf
-%{_sbindir}/ricci-modlog
-%{_sbindir}/ricci-modlog.exe
-
-%post -n ricci-modlog
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd reload > /dev/null 2>&1
-exit 0
-
-%preun -n ricci-modlog
-
-%postun -n ricci-modlog
-/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd reload > /dev/null 2>&1
-exit 0
-
-
-
-
### cluster-snmp ###
@@ -467,6 +388,8 @@
%changelog
+* Fri Jun 16 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-4
+- Moved storage, service, log and rpm modules into main ricci.rpm.
* Wed Jun 14 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-1
- Packaged cluster-snmp (cluster snmp agent)
- Packaged cluster-cim (cluster CIM provider)
--- conga/make/version.in 2006/06/15 03:08:35 1.4
+++ conga/make/version.in 2006/06/16 21:34:25 1.5
@@ -1,2 +1,2 @@
VERSION=0.8
-RELEASE=3.FC5
+RELEASE=4.FC5
next reply other threads:[~2006-06-16 21:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-16 21:34 kupcevic [this message]
-- strict thread matches above, loose matches on Subject: below --
2006-06-27 21:15 [Cluster-devel] conga ./conga.spec.in.in make/version.in kupcevic
2006-07-25 19:51 kupcevic
2006-08-03 20:54 kupcevic
2007-03-27 17:14 rmccabe
2008-09-23 16:05 rmccabe
2008-09-29 17:11 rmccabe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060616213425.27566.qmail@sourceware.org \
--to=kupcevic@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.