All of lore.kernel.org
 help / color / mirror / Atom feed
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga Makefile clustermon.spec.in.in ricci.spe ...
Date: 19 Mar 2008 20:09:50 -0000	[thread overview]
Message-ID: <20080319200950.26743.qmail@sourceware.org> (raw)

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2008-03-19 20:09:49

Modified files:
	.              : Makefile clustermon.spec.in.in ricci.spec.in.in 

Log message:
	more build tweaks

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&r1=1.39&r2=1.40
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci.spec.in.in.diff?cvsroot=cluster&r1=1.6&r2=1.7

--- conga/Makefile	2008/02/19 18:37:39	1.16
+++ conga/Makefile	2008/03/19 20:09:49	1.17
@@ -64,6 +64,8 @@
 	rm -f conga*.tar.gz conga*.src.rpm
 	rm -f clustermon.spec clustermon.spec.in
 	rm -f clustermon*.tar.gz clustermon*.src.rpm
+	rm -f ricci.spec ricci.spec.in
+	rm -f ricci*.tar.gz ricci*.src.rpm
 
 rebuild: clean all
 
--- conga/clustermon.spec.in.in	2008/03/19 17:59:15	1.39
+++ conga/clustermon.spec.in.in	2008/03/19 20:09:49	1.40
@@ -27,7 +27,7 @@
 Source0: %{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: cman-devel
+BuildRequires: cman-devel libvirt-devel
 BuildRequires: glibc-devel gcc-c++ libxml2-devel
 BuildRequires: openssl-devel dbus-devel pam-devel pkgconfig
 BuildRequires: net-snmp-devel tog-pegasus-devel
@@ -69,8 +69,6 @@
 Requires(post): chkconfig initscripts util-linux
 Requires(preun): chkconfig initscripts
 Requires(postun): initscripts util-linux
-Conflicts: clumon
-Conflicts: ricci-modcluster
 
 %description -n modcluster
 Management module for Red Hat Enterprise Linux Cluster Suite.
@@ -121,11 +119,10 @@
 Summary: Red Hat Enterprise Linux Cluster Suite - SNMP agent
 
 Requires: modcluster = %{version}-%{release}
-Requires: net-snmp
+Requires: net-snmp libvirt
 Requires: oddjob openssl
 Requires(post): initscripts
 Requires(postun): initscripts
-Conflicts: clumon-snmp
 
 %description -n cluster-snmp
 SNMP agent for Red Hat Enterprise Linux Cluster Suite.
@@ -161,7 +158,6 @@
 Requires: oddjob openssl
 Requires(post): initscripts
 Requires(postun): initscripts
-Conflicts: clumon-cim
 
 %description -n cluster-cim
 CIM provider for Red Hat Enterprise Linux Cluster Suite.
--- conga/ricci.spec.in.in	2008/03/19 17:59:15	1.6
+++ conga/ricci.spec.in.in	2008/03/19 20:09:49	1.7
@@ -23,11 +23,11 @@
 BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
 BuildRequires: cman-devel libcap-devel
 BuildRequires: cyrus-sasl-devel >= 2.1
-BuildRequires: openssl-devel dbus-devel pkgconfig file-devel libvirt-devel
+BuildRequires: openssl-devel dbus-devel pkgconfig file-devel
 
 Requires: initscripts
 Requires: oddjob dbus openssl pam cyrus-sasl >= 2.1
-Requires: sed util-linux libvirt file libxml2 libcap
+Requires: sed util-linux file libxml2 libcap
 Requires: modcluster >= 0.10.0
 # modstorage
 Requires: parted util-linux



                 reply	other threads:[~2008-03-19 20:09 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20080319200950.26743.qmail@sourceware.org \
    --to=rmccabe@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.