summaryrefslogtreecommitdiffstats
path: root/cobbler.spec
diff options
context:
space:
mode:
authorJames Laska <jlaska@redhat.com>2008-12-19 11:30:58 -0500
committerJames Laska <jlaska@redhat.com>2008-12-19 11:30:58 -0500
commitdfe54082642e4907c9be54242858dd065b0c9601 (patch)
tree4f5455d427f824337c733d0164510cd6b1469abe /cobbler.spec
parentc8b230d89dfe6de2931f630a3365c0c4da697b13 (diff)
parentfa705f6e45731206ba8fb31099461014f8cf57ce (diff)
downloadcobbler-dfe54082642e4907c9be54242858dd065b0c9601.tar.gz
cobbler-dfe54082642e4907c9be54242858dd065b0c9601.tar.xz
cobbler-dfe54082642e4907c9be54242858dd065b0c9601.zip
Merge commit 'origin/devel' into devel
Diffstat (limited to 'cobbler.spec')
-rw-r--r--cobbler.spec16
1 files changed, 10 insertions, 6 deletions
diff --git a/cobbler.spec b/cobbler.spec
index 9f51c558..8d53c663 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -2,7 +2,7 @@
Summary: Boot server configurator
Name: cobbler
AutoReq: no
-Version: 1.3.4
+Version: 1.4.0
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
License: GPLv2+
@@ -51,16 +51,16 @@ Url: http://cobbler.et.redhat.com
%description
-Cobbler is a network boot and update server. Cobbler
-supports PXE, provisioning virtualized images, and
+Cobbler is a network install server. Cobbler
+supports PXE, virtualized installs, and
reinstalling existing Linux machines. The last two
-modes require a helper tool called 'koan' that
+modes use a helper tool, 'koan', that
integrates with cobbler. Cobbler's advanced features
include importing distributions from DVDs and rsync
mirrors, kickstart templating, integrated yum
mirroring, and built-in DHCP/DNS Management. Cobbler has
a Python and XMLRPC API for integration with other
-applications.
+applications. There is also a web interface.
%prep
%setup -q
@@ -304,8 +304,12 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Dec 19 2008 Michael DeHaan <mdehaan@redhat.com> - 1.4.0-1
+- Upstream changes (see CHANGELOG)
+- Updated selinux setup
+
* Wed Dec 10 2008 Michael DeHaan <mdehaan@redhat.com> - 1.3.4-1
-- Updated test release
+- Updated test release (see CHANGELOG)
- Upstream changes (see CHANGELOG)
- Added specfile changes for python 2.6