From 034e70f8e09b2844edf53a299efa65bc2e5c1d4a Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Sep 25 2014 18:23:19 +0000
Subject: Rebuild the latest pykickstart for F21.


This includes F22 syntax support, but I've added a patch to make pykickstart
default to F21.  This should mean anyone passing makeVersion(DEVEL) should
not need to do anything to get the version they want.

---

diff --git a/0001-Default-to-the-F21-version-of-kickstart-syntax.patch b/0001-Default-to-the-F21-version-of-kickstart-syntax.patch
new file mode 100644
index 0000000..681c350
--- /dev/null
+++ b/0001-Default-to-the-F21-version-of-kickstart-syntax.patch
@@ -0,0 +1,59 @@
+From 913a5f249b0b44ade86688179029e2cd7a5abf25 Mon Sep 17 00:00:00 2001
+From: Chris Lumens <clumens@redhat.com>
+Date: Thu, 25 Sep 2014 14:14:25 -0400
+Subject: [PATCH] Default to the F21 version of kickstart syntax.
+
+---
+ pykickstart/version.py |  4 ++--
+ tests/version.py       | 13 +------------
+ 2 files changed, 3 insertions(+), 14 deletions(-)
+
+diff --git a/pykickstart/version.py b/pykickstart/version.py
+index 7248f64..ca4b2eb 100644
+--- a/pykickstart/version.py
++++ b/pykickstart/version.py
+@@ -78,8 +78,8 @@ F20 = 18000
+ F21 = 19000
+ F22 = 20000
+ 
+-# This always points at the latest version and is the default.
+-DEVEL = F22
++# Point to the proper version of kickstart syntax for this release.
++DEVEL = F21
+ 
+ # A one-to-one mapping from string representations to version numbers.
+ versionMap = {
+diff --git a/tests/version.py b/tests/version.py
+index 2262ffe..02f4072 100644
+--- a/tests/version.py
++++ b/tests/version.py
+@@ -148,17 +148,6 @@ class StringToVersion_TestCase(CommandTest):
+ 
+ class VersionToString_TestCase(CommandTest):
+     def runTest(self):
+-
+-        # Make sure DEVEL is the highest version, but RHEL versions aren't
+-        # counted as devel.
+-        highest = 0
+-        for (ver_str,ver_num) in versionMap.items():
+-            if ver_str.startswith("RHEL"):
+-                continue
+-
+-            highest = max(ver_num, highest)
+-        self.assertEqual(highest, DEVEL)
+-
+         # FC series
+         self.assertEqual(versionToString(FC3), "FC3")
+         self.assertEqual(versionToString(FC4), "FC4")
+@@ -184,7 +173,7 @@ class VersionToString_TestCase(CommandTest):
+         self.assertEqual(versionToString(F20, skipDevel=True), "F20")
+         self.assertEqual(versionToString(F21, skipDevel=True), "F21")
+         self.assertEqual(versionToString(F22, skipDevel=True), "F22")
+-        self.assertEqual(versionToString(F22, skipDevel=False), "DEVEL")
++        self.assertEqual(versionToString(F21, skipDevel=False), "DEVEL")
+         # RHEL series
+         self.assertEqual(versionToString(RHEL3), "RHEL3")
+         self.assertEqual(versionToString(RHEL4), "RHEL4")
+-- 
+1.9.3
+
diff --git a/pykickstart.spec b/pykickstart.spec
index 71e87b4..b515f52 100644
--- a/pykickstart.spec
+++ b/pykickstart.spec
@@ -4,11 +4,12 @@ Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
 Version: 1.99.60
-Release: 1%{?dist}
+Release: 2%{?dist}
 # This is a Red Hat maintained package which is specific to
 # our distribution.  Thus the source is only available from
 # within this srpm.
 Source0: %{name}-%{version}.tar.gz
+Patch0: 0001-Default-to-the-F21-version-of-kickstart-syntax.patch
 
 License: GPLv2
 Group: System Environment/Libraries
@@ -27,6 +28,7 @@ files.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make
@@ -54,6 +56,9 @@ make test
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 25 2014 Chris Lumens <clumens@redhat.com> 1.99.60-2
+- Add a patch to default to F21 syntax.
+
 * Wed Sep 24 2014 Chris Lumens <clumens@redhat.com> - 1.99.60-1
 - Make --size and --percent mutually exclusive in logvol. (dlehman)
 - Add support for F22. (clumens)