[koji] add patch to fix kickstart parsing

[Dennis Gilmore]

commit a05409280801a3c8d07def25bde2f856c2c0c5d2
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Mon Aug 4 07:07:33 2014 -0500

    add patch to fix kickstart parsing

 0001-correctly-call-pykickstarts-makeVersion.patch |   41 ++++++++++++++++++++
 koji.spec                                          |    8 +++-
 2 files changed, 47 insertions(+), 2 deletions(-)
---
diff --git a/0001-correctly-call-pykickstarts-makeVersion.patch b/0001-correctly-call-pykickstarts-makeVersion.patch
new file mode 100644
index 0000000..9da02a5
--- /dev/null
+++ b/0001-correctly-call-pykickstarts-makeVersion.patch
@@ -0,0 +1,41 @@
+From 049ab0dd94544bb0770defa54b1322812e6d3082 Mon Sep 17 00:00:00 2001
+From: Dennis Gilmore <dennis at ausil.us>
+Date: Mon, 4 Aug 2014 05:02:08 -0500
+Subject: [PATCH] correctly call pykickstarts makeVersion
+
+---
+ builder/kojid | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/builder/kojid b/builder/kojid
+index b23e9ce..2451ea6 100755
+--- a/builder/kojid
++++ b/builder/kojid
+@@ -2387,9 +2387,9 @@ class ImageTask(BaseTaskHandler):
+         #      may not be a problem if the included kickstarts are present
+         #      in the repository we checked out.
+         if opts.get('ksversion'):
+-            version = ksparser.makeVersion(ksparser.stringToVersion(opts['ksversion']))
++            version = ksparser.version.makeVersion(ksparser.stringToVersion(opts['ksversion']))
+         else:
+-            version = ksparser.makeVersion()
++            version = ksparser.version.makeVersion()
+         self.ks = ksparser.KickstartParser(version)
+         try:
+             self.ks.readKickstart(kspath)
+@@ -2768,10 +2768,10 @@ class OzImageTask(BaseTaskHandler):
+         #      macros, Oz will fail because it can only handle flat files.
+         #      We require users to flatten their kickstart file.
+         if self.opts.get('ksversion'):
+-            version = ksparser.makeVersion(
++            version = ksparser.version.makeVersion(
+                 ksparser.stringToVersion(self.opts['ksversion']))
+         else:
+-            version = ksparser.makeVersion()
++            version = ksparser.version.makeVersion()
+         ks = ksparser.KickstartParser(version)
+         self.logger.debug('attempting to read kickstart: %s' % kspath)
+         try:
+-- 
+2.0.4
+
diff --git a/koji.spec b/koji.spec
index 881768c..f4ef49f 100644
--- a/koji.spec
+++ b/koji.spec
@@ -2,7 +2,7 @@
 
 Name: koji
 Version: 1.9.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2 and GPLv2+
 # koji.ssl libs (from plague) are GPLv2+
 Summary: Build system tools
@@ -21,7 +21,7 @@ Patch9: 0008-bump-install-timeout-to-2-hours.patch
 Patch10: 0001-refactor-image-build-handlers-in-kojid.patch
 Patch11: 0002-refactor-do_images.patch
 Patch12: 0003-add-raw-xz-option.patch
-
+Patch13: 0001-correctly-call-pykickstarts-makeVersion.patch
 
 Source: https://fedorahosted.org/released/koji/koji-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -150,6 +150,7 @@ koji-web is a web UI to the Koji system.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 
@@ -253,6 +254,9 @@ if [ $1 = 0 ]; then
 fi
 
 %changelog
+* Mon Aug 04 2014 Dennis Gilmore <dennis at ausil.us> - 1.9.0-6
+- add patch to fix kickstart parsing
+
 * Mon Aug 04 2014 Dennis Gilmore <dennis at ausil.us> - 1.9.0-5
 - add upstream patches for better docker support