[condor/f18] Fix for aviary hadoop field swap

[tstclair]

commit ce276a968fd6f4726eca176549eac93150844ad8
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Sat Jun 22 17:21:01 2013 -0500

    Fix for aviary hadoop field swap

 aviaryfields.patch |   15 +++++++++++++++
 condor.spec        |    5 +++++
 2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/aviaryfields.patch b/aviaryfields.patch
new file mode 100644
index 0000000..0d07ae7
--- /dev/null
+++ b/aviaryfields.patch
@@ -0,0 +1,15 @@
+diff --git a/src/condor_contrib/aviary/src/hadoop/HadoopObject.cpp b/src/condor_contrib/aviary/src/hadoop/HadoopObject.cpp
+index 1fb6144..d0099a0 100644
+--- a/src/condor_contrib/aviary/src/hadoop/HadoopObject.cpp
++++ b/src/condor_contrib/aviary/src/hadoop/HadoopObject.cpp
+@@ -333,8 +333,8 @@ int HadoopObject::start( tHadoopInit & hInit )
+     if (hInit.unmanaged)
+     {
+         ::SetAttribute(cluster, proc, "GridoopManaged", quote_it("UNMANAGED").c_str());
+-        ::SetAttribute(cluster, proc, "IPCAddress", quote_it(hInit.idref.http.c_str()).c_str());
+-        ::SetAttribute(cluster, proc, "HTTPAddress", quote_it(hInit.idref.ipcid.c_str()).c_str());
++        ::SetAttribute(cluster, proc, "IPCAddress", quote_it(hInit.idref.ipcid.c_str()).c_str());
++        ::SetAttribute(cluster, proc, "HTTPAddress", quote_it(hInit.idref.http.c_str()).c_str());
+         
+         // EARLY SET: These attribute are set early so the incoming ad
+         // has a change to override them.
diff --git a/condor.spec b/condor.spec
index 67721b1..9a6e9f0 100644
--- a/condor.spec
+++ b/condor.spec
@@ -113,6 +113,7 @@ Source3: %{name}.service
 Source4: condor-lcmaps-env.sysconfig
 %endif
 
+Patch0: aviaryfields.patch
 Patch1: chkconfig_off.patch
 Patch2: hcc_config.patch
 Patch4: condor_pid_namespaces_v7.patch
@@ -447,6 +448,7 @@ exit 0
 %endif
 
 
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch5 -p1
@@ -1203,6 +1205,9 @@ fi
 %endif
 
 %changelog
+* Sat Jun 22 2013 <tstclair at redhat.com> - 8.1.0-0.2
+- Fix for aviary hadoop field swap
+
 * Wed Jun 19 2013 <tstclair at redhat.com> - 8.1.0-0.1
 - Update to latest uw/master