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

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2008-03-28 01:17:12

Modified files:
	.              : clustermon.spec.in.in ricci.spec.in.in 
	make           : version.in 

Log message:
	Fix bz433678

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&r1=1.40&r2=1.41
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci.spec.in.in.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.35&r2=1.36

--- conga/clustermon.spec.in.in	2008/03/19 20:09:49	1.40
+++ conga/clustermon.spec.in.in	2008/03/28 01:17:11	1.41
@@ -64,7 +64,7 @@
 Group: System Environment/Base
 Summary: Red Hat Enterprise Linux Cluster Suite - remote management
 
-Requires: cman oddjob dbus openssl libxml2
+Requires: cman oddjob dbus openssl
 Requires: initscripts util-linux
 Requires(post): chkconfig initscripts util-linux
 Requires(preun): chkconfig initscripts
--- conga/ricci.spec.in.in	2008/03/19 20:09:49	1.7
+++ conga/ricci.spec.in.in	2008/03/28 01:17:11	1.8
@@ -17,7 +17,7 @@
 Summary: Remote Management System - Managed Station
 Summary: Remote Cluster and Storage Management System
 Source0: %{name}-%{version}.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: python-devel >= 2.4.1
 BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
@@ -27,7 +27,7 @@
 
 Requires: initscripts
 Requires: oddjob dbus openssl pam cyrus-sasl >= 2.1
-Requires: sed util-linux file libxml2 libcap
+Requires: sed util-linux file
 Requires: modcluster >= 0.10.0
 # modstorage
 Requires: parted util-linux
@@ -127,4 +127,8 @@
 
 %changelog
 * Wed Feb 20 2008 Ryan McCabe <rmccabe at redhat.com> 0.13.0-1
-- Initial build.
+ - Initial build.
+
+* Wed Mar 26 2008 Chris Feist <cfeist at redhat.com> 0.13.0-2
+ - Don't require cap and xml libraries (RPM will find them)
+ - Fix buildroot to meet Fedora standard
--- conga/make/version.in	2008/02/20 17:07:55	1.35
+++ conga/make/version.in	2008/03/28 01:17:11	1.36
@@ -1,2 +1,2 @@
 VERSION=0.13.0
-RELEASE=1
+RELEASE=2