orion pushed to cobbler (epel7). "Merge branch 'master' into epel7"

[notifications at fedoraproject.org]

From 7c28058257705165a019052048ce610fffba249f Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at cora.nwra.com>
Date: Fri, 8 May 2015 19:30:57 -0600
Subject: Update to 2.6.8

- Backport upstream patch to fix centos version detection (bug #1201879)

diff --git a/.gitignore b/.gitignore
index 1c9e831..466eada 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ cobbler-2.0.5.tar.gz
 /cobbler-2.6.5.tar.gz
 /cobbler-2.6.6.tar.gz
 /cobbler-2.6.7.tar.gz
+/cobbler-2.6.8.tar.gz
diff --git a/cobbler-centos.patch b/cobbler-centos.patch
new file mode 100644
index 0000000..d87eef5
--- /dev/null
+++ b/cobbler-centos.patch
@@ -0,0 +1,14 @@
+diff -up cobbler-2.6.8/koan/utils.py.centos cobbler-2.6.8/koan/utils.py
+--- cobbler-2.6.8/koan/utils.py.centos	2015-05-08 19:25:57.530993499 -0600
++++ cobbler-2.6.8/koan/utils.py	2015-05-08 19:27:48.124509895 -0600
+@@ -360,7 +360,9 @@ def os_release():
+       tokens = rest.split(" ")
+       for t in tokens:
+          try:
+-             return (make,float(t))
++             match = re.match('^\d+(?:\.\d+)?', t)
++             if match:
++                 return (make, float(match.group(0)))
+          except ValueError, ve:
+              pass
+       raise CX("failed to detect local OS version from /etc/redhat-release")
diff --git a/cobbler.spec b/cobbler.spec
index dcc79a9..79d81eb 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -15,11 +15,14 @@ Summary: Boot server configurator
 Name: cobbler
 License: GPLv2+
 AutoReq: no
-Version: 2.6.7
-Release: 3%{?dist}
+Version: 2.6.8
+Release: 1%{?dist}
 Source0: https://github.com/cobbler/cobbler/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 # Support newer virt-install - https://bugzilla.redhat.com/show_bug.cgi?id=1188424
 Patch0: cobbler-virtinstall.patch
+# Support centos release numbering
+# https://bugzilla.redhat.com/show_bug.cgi?id=1201879
+Patch1: cobbler-centos.patch
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
@@ -79,6 +82,7 @@ other applications.
 %prep
 %setup -q
 %patch0 -p1 -b .virtinstall
+%patch1 -p1 -b .centos
 
 %build
 %{__python2} setup.py build
@@ -273,6 +277,10 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
 
 
 %changelog
+* Fri May 8 2015 Orion Poplawski <orion at cora.nwra.com> - 2.6.8-1
+- Update to 2.6.8
+- Backport upstream patch to fix centos version detection (bug #1201879)
+
 * Tue Apr 28 2015 Orion Poplawski <orion at cora.nwra.com> - 2.6.7-3
 - Add patch to fix virt-install support for F21+/EL7 (bug #1188424)
 
diff --git a/sources b/sources
index 97d96bc..d0950d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a42aa6d9d919b394988adab4c5ed3fe1  cobbler-2.6.7.tar.gz
+8f3bc839361c9c09f310f1c4904e9256  cobbler-2.6.8.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cobbler.git/commit/?h=epel7&id=5c425960ef0f98b7400a70f88adf8f3ce24d51b7