rpms/ricci/devel .cvsignore, 1.3, 1.4 ricci.spec, 1.15, 1.16 sources, 1.10, 1.11 ricci-0.15.0-includes.patch, 1.1, NONE

[Ryan McCabe]

Author: rmccabe

Update of /cvs/pkgs/rpms/ricci/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29381

Modified Files:
	.cvsignore ricci.spec sources 
Removed Files:
	ricci-0.15.0-includes.patch 
Log Message:
* Mon Mar 30 2009 Ryan McCabe <rmccabe at redhat.com> 0.16.0-1
- Update for F11
- Fix build issues uncovered by g++ 4.4
- Remove legacy RHEL4 and RHEL5-specific code.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	9 Sep 2008 19:35:07 -0000	1.3
+++ .cvsignore	30 Mar 2009 19:59:11 -0000	1.4
@@ -1 +1 @@
-ricci-0.15.0.tar.gz
+ricci-0.16.0.tar.gz


Index: ricci.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/devel/ricci.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ricci.spec	3 Mar 2009 08:57:41 -0000	1.15
+++ ricci.spec	30 Mar 2009 19:59:12 -0000	1.16
@@ -9,47 +9,29 @@
 ###############################################################################
 
 Name: ricci
-Version: 0.15.0
-Release: 11%{?dist}
+Version: 0.16.0
+Release: 1%{?dist}
 License: GPLv2
 URL: http://sources.redhat.com/cluster/conga/
 Group: System Environment/Base
-Summary: Remote Management System - Managed Station
 Summary: Remote Cluster and Storage Management System
-Source0: %{name}-%{version}.tar.gz
+Source0: http://people.redhat.com/rmccabe/conga/fedora/src/ricci-0.16.0.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: python-devel >= 2.4.1
-BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
-BuildRequires: libcap-devel
+BuildRequires: libxml2-devel python-devel libcap-devel
+BuildRequires: openssl-devel dbus-devel pkgconfig file-devel nss-devel
 BuildRequires: cyrus-sasl-devel >= 2.1
-BuildRequires: openssl-devel dbus-devel pkgconfig file-devel
-BuildRequires: nss-devel
-
-Requires: initscripts
-Requires: oddjob dbus openssl pam cyrus-sasl >= 2.1
-Requires: sed util-linux file
 
+Requires: oddjob dbus openssl cyrus-sasl >= 2.1 file
 # modstorage
-Requires: parted util-linux
-# modservice
-Requires: chkconfig initscripts
+Requires: parted
 
-Requires(pre): grep shadow-utils
-Requires(post): chkconfig initscripts util-linux
+Requires(post): chkconfig initscripts
 Requires(preun): chkconfig initscripts
-Requires(postun): initscripts util-linux
-
-Patch0: ricci-0.15.0-includes.patch
-
-%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.
+Requires(postun): initscripts
 
 %prep
 %setup -q
-%patch0 -p1 -b .includes
 
 %build
 %configure --arch=%{_arch} --docdir=%{_docdir}
@@ -62,16 +44,15 @@
 %clean
 rm -rf %{buildroot}
 
+%description
+ricci is a cluster and storage management and configuration
+daemon. The ricci daemon, dispatches incoming messages to
+underlying management modules.
 
-%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.
-
-This package contains listening daemon (dispatcher), as well as
-reboot, rpm, storage, service and log management modules.
+This package contains the listener daemon (dispatcher), as well as
+reboot, rpm, storage, service, virtual machine, and log management modules.
 
-%files -n ricci
+%files
 %defattr(-,root,root)
 	%{_bindir}/ccs_sync
 
@@ -85,18 +66,20 @@
 %attr(-,root,ricci)	%{_libexecdir}/ricci/
 			%{_docdir}/ricci-%{version}/
 # modrpm
-
 %config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modrpm.oddjob.conf
 %config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modrpm.systembus.conf
 			%{_libexecdir}/ricci-modrpm
+
 # modstorage
 %config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modstorage.oddjob.conf
 %config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modstorage.systembus.conf
 			%{_libexecdir}/ricci-modstorage
+
 # modservice
 %config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modservice.oddjob.conf
 %config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modservice.systembus.conf
 			%{_libexecdir}/ricci-modservice
+
 # modlog
 %config(noreplace)	%{_sysconfdir}/oddjobd.conf.d/ricci-modlog.oddjob.conf
 %config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modlog.systembus.conf
@@ -107,26 +90,26 @@
 %config(noreplace)	%{_sysconfdir}/dbus-1/system.d/ricci-modvirt.systembus.conf
 			%{_libexecdir}/ricci-modvirt
 
-%pre -n ricci
+%pre
 getent group ricci >/dev/null || groupadd -r ricci
 getent passwd ricci >/dev/null || useradd -r -g ricci -d /var/lib/ricci -s /sbin/nologin -c "ricci daemon user" ricci
 exit 0
 
-%post -n ricci
+%post
 DBUS_PID=`cat /var/run/messagebus.pid 2>/dev/null`
 /bin/kill -s SIGHUP $DBUS_PID >&/dev/null
 /sbin/service oddjobd reload >&/dev/null
 /sbin/chkconfig --add ricci
 exit 0
 
-%preun -n ricci
+%preun
 if [ "$1" == "0" ]; then
 	/sbin/service ricci stop >&/dev/null
 	/sbin/chkconfig --del ricci
 fi
 exit 0
 
-%postun -n ricci
+%postun
 if [ "$1" == "0" ]; then
 	DBUS_PID=`cat /var/run/messagebus.pid 2>/dev/null`
 	/bin/kill -s SIGHUP $DBUS_PID >&/dev/null
@@ -138,6 +121,11 @@
 exit 0
 
 %changelog
+* Mon Mar 30 2009 Ryan McCabe <rmccabe at redhat.com> 0.16.0-1
+- Update for F11
+- Fix build issues uncovered by g++ 4.4
+- Remove legacy RHEL4 and RHEL5-specific code.
+
 * Tue Mar 03 2009 Caolán McNamara <caolanm at redhat.com> - 0.15.0-11
 - include stdio.h for perror, stdint.h for uint32_t
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ricci/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	22 Oct 2008 19:49:39 -0000	1.10
+++ sources	30 Mar 2009 19:59:12 -0000	1.11
@@ -1 +1 @@
-04f5dce1fb365215deb5aefdd5c9eaec  ricci-0.15.0.tar.gz
+fad8f74a0dc458d67191f134027d5265  ricci-0.16.0.tar.gz


--- ricci-0.15.0-includes.patch DELETED ---