[cobbler/f18] New upstream release: 2.4.0-beta6
jimi
jimi at fedoraproject.org
Fri May 24 21:26:29 UTC 2013
commit a50a81c1244da196a2b7f965c08ad23a96630e2f
Author: James Cammarata <jimi at sngx.net>
Date: Fri May 24 16:11:24 2013 -0500
New upstream release: 2.4.0-beta6
Conflicts:
cobbler.spec
cobbler.spec | 11 ++++++-----
sources | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/cobbler.spec b/cobbler.spec
index 8248985..7725f90 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -8,12 +8,12 @@ Name: cobbler
License: GPLv2+
AutoReq: no
Version: 2.4.0
-Release: beta5%{?dist}
+Release: beta6%{?dist}
Source0: http://shenson.fedorapeople.org/cobbler/cobbler-%{version}.tar.gz
Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
-Url: http://cobbler.github.com/
+Url: http://www.cobblerd.org/
BuildRequires: redhat-rpm-config
BuildRequires: git
@@ -25,13 +25,13 @@ Requires: httpd
Requires: tftp-server
Requires: mod_wsgi
Requires: createrepo
-Requires: python-augeas
Requires: python-cheetah
Requires: python-netaddr
Requires: python-simplejson
Requires: python-urlgrabber
Requires: PyYAML
Requires: rsync
+Requires: syslinux
%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
Requires: python(abi) >= %{pyver}
@@ -258,8 +258,6 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
/tftpboot/images
%endif
-/usr/share/augeas/lenses/cobblersettings.aug
-
%doc AUTHORS CHANGELOG README COPYING
%package -n koan
@@ -334,6 +332,9 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
/var/www/cobbler_webui_content/
%changelog
+* Fri May 24 2013 James Cammarata <jimi at sngx.net> 2.4.0-beta6
+- New BETA release - 2.4.0 beta6
+
* Mon Apr 22 2013 James Cammarata <jimi at sngx.net> 2.4.0-beta5
- A few bugfixes and rebuilding the RPM because of a goof
(jimi at sngx.net)
diff --git a/sources b/sources
index 4896a9f..76a9381 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ede78f714ddf22e54593512c4b25dabc cobbler-2.4.0.tar.gz
+8412d444850bd84cd9123749698b403e cobbler-2.4.0.tar.gz
More information about the scm-commits
mailing list