[glite-lb-client] Patch for multilib glite-lb-common-devel.

[František Dvořák]

commit 41b65e78346cf02a4ed627bef4d62eaf9368ec3b
Author: František Dvořák <valtri at civ.zcu.cz>
Date:   Thu Jul 3 20:40:43 2014 +0200

    Patch for multilib glite-lb-common-devel.

 glite-lb-client.spec |    9 ++++++++-
 unify-headers.patch  |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/glite-lb-client.spec b/glite-lb-client.spec
index 45943f1..50cbbb6 100644
--- a/glite-lb-client.spec
+++ b/glite-lb-client.spec
@@ -2,12 +2,15 @@
 
 Name:           glite-lb-client
 Version:        6.0.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        gLite Logging and Bookkeeping client library
 
 License:        ASL 2.0
 URL:            http://glite.cern.ch
 Source:         http://scientific.zcu.cz/emi/emi.lb.client/%{name}-%{version}.tar.gz
+# multilib %%{name}-devel
+# https://github.com/CESNET/glite-lb/commit/8ee6d05aef5e988d6f7e6add0aa97ebbc05ae94d
+Patch0:         unify-headers.patch
 
 %if 0%{?rhel} <= 6 && ! 0%{?fedora}
 BuildRequires:  classads-devel
@@ -54,6 +57,7 @@ This package contains client programs and examples for gLite L&B.
 
 %prep
 %setup -q
+%patch0 -p2
 
 
 %build
@@ -110,6 +114,9 @@ rm -f %{buildroot}%{_libdir}/*.la
 
 
 %changelog
+* Thu Jun 26 2014 František Dvořák <valtri at civ.zcu.cz> - 6.0.10-2
+- Patch for multilib %%{name}-devel
+
 * Thu Jun 26 2014 František Dvořák <valtri at civ.zcu.cz> - 6.0.10-1
 - New release 6.0.10 (L&B 4.1.2)
 - Consistent style with buildroot macro
diff --git a/unify-headers.patch b/unify-headers.patch
new file mode 100644
index 0000000..4e10b24
--- /dev/null
+++ b/unify-headers.patch
@@ -0,0 +1,34 @@
+commit 8ee6d05aef5e988d6f7e6add0aa97ebbc05ae94d
+Author: František Dvořák <valtri at civ.zcu.cz>
+Date:   Wed Jul 2 18:05:46 2014 +0200
+
+    Generate always the same header file by ordering fields. This is the second part of the fix for issue #26.
+
+diff --git a/org.glite.lb.client/interface/Event.h.T b/org.glite.lb.client/interface/Event.h.T
+index 1aa05b3..a917d3d 100644
+--- a/org.glite.lb.client/interface/Event.h.T
++++ b/org.glite.lb.client/interface/Event.h.T
+@@ -120,8 +120,8 @@ public:
+ 	};
+ 
+ @@@{
+-	for my $f (getAllFields $event) {
+-		for my $t (getFieldOccurence $event $f) {
++	for my $f (sort {$a cmp $b} getAllFields $event) {
++		for my $t (sort (getFieldOccurence $event $f)) {
+ 			my $ff;
+ 			my $ut;
+ 			my $utf;
+diff --git a/org.glite.lb.client/interface/JobStatus.h.T b/org.glite.lb.client/interface/JobStatus.h.T
+index 20cbcf3..d800327 100644
+--- a/org.glite.lb.client/interface/JobStatus.h.T
++++ b/org.glite.lb.client/interface/JobStatus.h.T
+@@ -103,7 +103,7 @@ public:
+ 
+ @@@{
+ 	selectType $status '_common_';
+-	for my $n (getAllFields $status) {
++	for my $n (sort {$a cmp $b} getAllFields $status) {
+ 		selectField $status $n;
+ 		my $f = getField $status;
+ 		if ($f->{codes}) {