summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cobbler.spec11
-rw-r--r--setup.py4
2 files changed, 8 insertions, 7 deletions
diff --git a/cobbler.spec b/cobbler.spec
index 523485c..c2a1375 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -2,8 +2,9 @@
Summary: Boot server configurator
Name: cobbler
AutoReq: no
-Version: 0.9.2
-Release: 2%{?dist}
+Version: 1.0.0
+Release: 1%{?dist}
+>>>>>>> devel:cobbler.spec
Source0: %{name}-%{version}.tar.gz
License: GPLv2+
Group: Applications/System
@@ -40,9 +41,9 @@ 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.
+mirroring, and built-in DHCP/DNS Management. Cobbler has
+a Python and XMLRPC API for integration with other
+applications.
%prep
%setup -q
diff --git a/setup.py b/setup.py
index c659f9a..4b08917 100644
--- a/setup.py
+++ b/setup.py
@@ -4,10 +4,10 @@ import sys
from distutils.core import setup, Extension
import string
-VERSION = "0.9.2"
+VERSION = "1.0.0"
SHORT_DESC = "Network Boot and Update Server"
LONG_DESC = """
-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.
+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/DNS Management. Cobbler also has a Python and XMLRPC API for integration with other applications.
"""
if __name__ == "__main__":