commit 71f13632fd7e776ad1f87162d2286fb7da003e71
Author: Chris Lalancette <clalancette at gmail.com>
Date: Thu Aug 8 20:39:36 2013 -0400
Fix ICICLE generation.
Signed-off-by: Chris Lalancette <clalancette at gmail.com>
...ginal-order-of-package-list-used-for-ICIC.patch | 31 ++++++++++++++++++++
oz.spec | 7 ++++-
2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/0001-preseve-original-order-of-package-list-used-for-ICIC.patch b/0001-preseve-original-order-of-package-list-used-for-ICIC.patch
new file mode 100644
index 0000000..fde9e75
--- /dev/null
+++ b/0001-preseve-original-order-of-package-list-used-for-ICIC.patch
@@ -0,0 +1,31 @@
+From 82541ec78cab9194eadb26ca93a9a7da28318d22 Mon Sep 17 00:00:00 2001
+From: Ian Mcleod <imcleod at localhost.localdomain>
+Date: Thu, 8 Aug 2013 14:45:46 -0500
+Subject: [PATCH oz] preseve original order of package list used for ICICLE
+ generation
+
+Sorting the default format package list destroys the 1:1 match between it
+and any optional extra list, at least for RPM based operating systems.
+This also has the unintended side effect of producing a blank <extra> tag for
+the final package in the list.
+As the sorting is purely cosmetic, and can easily be done on the receiving end
+for clients that desire it, just remove it here to address both issues.
+---
+ oz/Guest.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/oz/Guest.py b/oz/Guest.py
+index 3b02601..32fd68d 100644
+--- a/oz/Guest.py
++++ b/oz/Guest.py
+@@ -1291,7 +1291,6 @@ class Guest(object):
+ description = icicle.newChild(None, "description", description)
+ packages = icicle.newChild(None, "packages", None)
+
+- lines.sort()
+ for index,line in enumerate(lines):
+ if line == "":
+ continue
+--
+1.8.1.4
+
diff --git a/oz.spec b/oz.spec
index c49c366..d1aaf10 100644
--- a/oz.spec
+++ b/oz.spec
@@ -1,11 +1,12 @@
Summary: Library and utilities for automated guest OS installs
Name: oz
Version: 0.11.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2
Group: Development/Libraries
URL: http://aeolusproject.org/oz.html
Source0: http://repos.fedorapeople.org/repos/aeolus/oz/%{version}/tarball/%{name}-%{version}.tar.gz
+Patch0: 0001-preseve-original-order-of-package-list-used-for-ICIC.patch
BuildArch: noarch
Requires: python >= 2.5
Requires: python-libguestfs >= 1.18
@@ -33,6 +34,7 @@ installations, with minimal input from the user.
%prep
%setup -q
+%patch0 -p1
%build
python setup.py build
@@ -81,6 +83,9 @@ fi
%changelog
+* Thu Aug 8 2013 Chris Lalancette <clalancette at gmail.com> - 0.11.0-2
+- Add in the upstream patch that fixes ICICLE generation with extra elements
+
* Sun Jul 28 2013 Chris Lalancette <clalancette at gmail.com> - 0.11.0-1
- Update to release 0.11.0