Description tweaks to RPM/setup.py and changelog updates

3 files changed, 19 insertions, 14 deletions

diff --git a/CHANGELOG b/CHANGELOG
index adbf0f1..573323f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
 Cobbler CHANGELOG
 (all entries mdehaan@redhat.com unless noted otherwise)
 
-* Thr Jul 26 2007 - 0.6.0 (RC)
+* Thr Jul 26 2007 - 0.5.2 (RC)
 - Have cobbler check ensure services are started
 - Add cobbler validateks command to look for broken rendered kickstarts
 
diff --git a/cobbler.spec b/cobbler.spec
index e85393a..fb66a6f 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.5.1
+Version: 0.5.2
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -29,15 +29,16 @@ Url: http://cobbler.et.redhat.com
 
 %description
 
-Cobbler is a network boot and update server.
-It can also be used as a Python library.  
-Cobbler supports PXE, provisioning virtualized images,
-and reinstalling machines that are already running (over SSH).
-The last two modes require a helper tool called 'koan' that
-integrates with cobbler.  Cobbler's advanced features include
-importing distributions from DVDs and rsync mirrors, kickstart templating,
-integrated yum mirroring, kickstart monitoring, and auto-managing
-DHCP configurations for ISC dhcpd and dnsmasq.
+Cobbler is a network boot and update server.  Cobbler 
+supports PXE, provisioning virtualized images, and 
+reinstalling existing Linux machines.  The last two 
+modes require a helper tool called '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 Management.  Cobbler has 
+a Python API for integration with other GPL systems 
+management applications.
 
 %prep
 %setup -q
@@ -136,6 +137,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Thu Jul 26 2007 Michael DeHaan <mdehaan@redhat.com> - 0.5.2-1
+- Upstream changes (see CHANGELOG)
+- Tweaked description
+
 * Fri Jul 20 2007 Michael DeHaan <mdehaan@redhat.com> - 0.5.1-1
 - Upstream changes (see CHANGELOG)
 - Modified description
diff --git a/setup.py b/setup.py
index b9e1c4b..ba6ecf4 100644
--- a/setup.py
+++ b/setup.py
@@ -4,10 +4,10 @@ import sys
 from distutils.core import setup, Extension
 import string
 
-VERSION = "0.5.1"
-SHORT_DESC = "Boot and update server configurator"
+VERSION = "0.5.2"
+SHORT_DESC = "Network Boot and Update Server"
 LONG_DESC = """
-Cobbler is a command line tool for configuration of boot/provisioning, and update servers which is also accessible as a Python library.  Cobbler supports PXE, provisioning virtualized images, and reinstalling machines that are already up and running (over SSH).  The last two modes require a helper tool called 'koan' that integrates with cobbler.  Cobbler's advanced features include importing distributions from rsync mirrors, kickstart templating, integrated yum mirroring (and linking repository setup with kickstarts), plus managing dhcpd.conf.
+Cobbler is a network boot and update server.  Cobbler supports PXE, provisioning virtualized images, and reinstalling existing Linux machines.  The last two modes require a helper tool called '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 Management.  Cobbler has a Python API for integration with other GPL systems management applications.
 """
 
 if __name__ == "__main__":