[cobbler] Update to 2.6.1

Orion Poplawski orion at fedoraproject.org
Fri May 23 21:43:54 UTC 2014


commit 1053f0e441d2a29d6b0c5473a6dffda205f8c330
Author: Orion Poplawski <orion at nwra.com>
Date:   Fri May 23 15:43:49 2014 -0600

    Update to 2.6.1
    
    - Drop koan patch applied upstream

 .gitignore   |    1 +
 cobbler.spec |   13 ++++++-------
 sources      |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4ec61a0..ea69d7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ cobbler-2.0.5.tar.gz
 /cobbler-2.4.0.tar.gz
 /cobbler-2.4.3.tar.gz
 /cobbler-2.6.0.tar.gz
+/cobbler-2.6.1.tar.gz
diff --git a/cobbler.spec b/cobbler.spec
index 644f05b..1b16f9d 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -10,13 +10,9 @@ Summary: Boot server configurator
 Name: cobbler
 License: GPLv2+
 AutoReq: no
-Version: 2.6.0
-Release: 2%{?dist}
+Version: 2.6.1
+Release: 1%{?dist}
 Source0: https://github.com/cobbler/cobbler/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# Fix koan's get_insert_script()
-# https://github.com/cobbler/cobbler/pull/866
-# https://bugzilla.redhat.com/show_bug.cgi?id=1047350
-Patch0: cobbler-koan.patch
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
@@ -77,7 +73,6 @@ other applications.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__python2} setup.py build
@@ -305,6 +300,10 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
 %attr(-,apache,apache) /var/www/cobbler_webui_content/
 
 %changelog
+* Fri May 23 2014 Orion Poplawski <orion at cora.nwra.com> - 2.6.1-1
+- Update to 2.6.1
+- Drop koan patch applied upstream
+
 * Tue Apr 22 2014 Orion Poplawski <orion at cora.nwra.com> - 2.6.0-2
 - Only require syslinux on x86
 
diff --git a/sources b/sources
index bb22aeb..14800de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a875c5efe415a2b52633b0e882f43a1c  cobbler-2.6.0.tar.gz
+0a026afb1af95f0cfa3092200c475e25  cobbler-2.6.1.tar.gz


More information about the scm-commits mailing list