----- Forwarded message from Tom Callaway <spot(a)fedoraproject.org> -----
Date: Sun, 19 Sep 2010 23:31:03 +0000 (UTC)
From: Tom Callaway <spot(a)fedoraproject.org>
To: matahari-owner(a)fedoraproject.org, scm-commits(a)lists.fedoraproject.org
Subject: [matahari/f14/master] fix compile with recent gcc
Content-Type: text/plain; charset="utf-8"
Message-Id: <20100919233103.E244627699(a)pkgs01.phx2.fedoraproject.org>
commit a8470fb66155a5000dcceb3fc7e9dbebe31f9e00
Author: Tom "spot" Callaway <tcallawa(a)redhat.com>
Date: Mon Sep 20 01:30:53 2010 +0200
fix compile with recent gcc
matahari-0.0.5-gcc-fix.patch | 50 ++++++++++++++++++++++++++++++++++++++++++
matahari.spec | 16 +++++++++----
2 files changed, 61 insertions(+), 5 deletions(-)
---
diff --git a/matahari-0.0.5-gcc-fix.patch b/matahari-0.0.5-gcc-fix.patch
new file mode 100644
index 0000000..f342140
--- /dev/null
+++ b/matahari-0.0.5-gcc-fix.patch
@@ -0,0 +1,50 @@
+diff -up matahari-0.0.5/src/host.cpp.gcc matahari-0.0.5/src/host.cpp
+--- matahari-0.0.5/src/host.cpp.gcc 2010-09-20 01:08:26.476255002 +0200
++++ matahari-0.0.5/src/host.cpp 2010-09-20 01:08:33.928255002 +0200
+@@ -24,6 +24,7 @@
+ #include <stdexcept>
+
+ #include <cstdlib>
++#include <limits.h>
+ #include <unistd.h>
+
+ #include <libvirt/libvirt.h>
+diff -up matahari-0.0.5/src/main.cpp.gcc matahari-0.0.5/src/main.cpp
+--- matahari-0.0.5/src/main.cpp.gcc 2010-09-20 01:08:56.444254998 +0200
++++ matahari-0.0.5/src/main.cpp 2010-09-20 01:12:23.486255002 +0200
+@@ -22,12 +22,13 @@
+
+ #include <iostream>
+ #include <fstream>
+-#include <string>
++#include <cstring>
+ #include <vector>
+ #include <exception>
+
+ #include <signal.h>
+ #include <cstdlib>
++#include <cerrno>
+
+ #include <getopt.h>
+
+@@ -81,7 +82,7 @@ int do_main(int argc, char **argv)
+ char *service = NULL;
+ int port = 5672;
+
+- ConnectionSettings settings;
++ qpid::management::ConnectionSettings settings;
+ ManagementAgent *agent;
+ HostWrapper *hostWrapper;
+
+diff -up matahari-0.0.5/src/nic.cpp.gcc matahari-0.0.5/src/nic.cpp
+--- matahari-0.0.5/src/nic.cpp.gcc 2010-09-20 01:12:38.887255001 +0200
++++ matahari-0.0.5/src/nic.cpp 2010-09-20 01:12:44.412255003 +0200
+@@ -18,7 +18,7 @@
+ */
+
+ #include <iostream>
+-#include <string>
++#include <cstring>
+ #include <sstream>
+ #include <vector>
+ #include <stdexcept>
diff --git a/matahari.spec b/matahari.spec
index dc16c25..94e0eb5 100644
--- a/matahari.spec
+++ b/matahari.spec
@@ -1,12 +1,13 @@
Summary: Qpid QMF Agent for Ovirt Nodes
Name: matahari
Version: 0.0.5
-Release: 1%{?dist}
+Release: 3%{?dist}
Source:
http://mcpierce.fedorapeople.org/sources/matahari-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
License: GPLv2
Group: Applications/System
URL:
http://matahari.fedorahosted.org/
+Patch0: matahari-0.0.5-gcc-fix.patch
Requires: dbus >= 1.2.12
Requires: hal >= 0.5.12
@@ -28,15 +29,16 @@ BuildRequires: pcre-devel >= 7.8
Matahari provides a QMF Agent that can be used to control and manage
various pieces of functionality for an ovirt node, using the AMQP protocol.
-The Advanced Message Queuing Protocol (AMQP) is an open standard application
+The Advanced Message Queuing Protocol (AMQP) is an open standard application
layer protocol providing reliable transport of messages.
-QMF provides a modeling framework layer on top of qpid (which implements
+QMF provides a modeling framework layer on top of qpid (which implements
AMQP). This interface allows you to manage a host and its various components
as a set of objects with properties and methods.
%prep
%setup -q
+%patch0 -p1 -b .gcc
%build
%configure
@@ -76,10 +78,15 @@ test "x%{buildroot}" != "x" && rm -rf
%{buildroot}
%doc AUTHORS COPYING
%changelog
+* Mon Sep 20 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.0.5-3
+- fix header and compiler issues in code which were preventing build
+
+* Mon Aug 16 2010 Darryl L. Pierce <dpierce(a)redhat.com> - 0.0.5-2
+- Rebuild for updated Qpid/WMF.
* Wed Jul 7 2010 Darryl L. Pierce <dpierce(a)redhat.com> - 0.0.5-1
- Rebuild for updated Qpid/QMF.
-- Resolves: rhbz602975 - Matahari messages are not accepted by current version of qpid in
F13
+- Resolves: rhbz602975 - Matahari messages are not accepted by current version of qpid in
F13
* Thu Oct 08 2009 Arjun Roy <arroy(a)redhat.com> - 0.0.4-7
- Refactored for new version of qpidc.
@@ -119,4 +126,3 @@ test "x%{buildroot}" != "x" && rm -rf
%{buildroot}
* Tue Jun 23 2009 Arjun Roy <arroy(a)redhat.com> - 0.0.1-1
- Initial rpmspec packaging
-
----- End forwarded message -----
--
Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc.
Delivering value year after year.
Red Hat ranks #1 in value among software vendors.
http://www.redhat.com/promo/vendor/