rpms/cobbler/FC-6 .cvsignore, 1.18, 1.19 cobbler.spec, 1.18, 1.19 sources, 1.19, 1.20

[Michael DeHaan (mdehaan)]

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13901

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream to 0.3.9




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	25 Jan 2007 23:46:16 -0000	1.18
+++ .cvsignore	29 Jan 2007 18:45:05 -0000	1.19
@@ -15,3 +15,4 @@
 cobbler-0.3.6.tar.gz
 cobbler-0.3.7.tar.gz
 cobbler-0.3.8.tar.gz
+cobbler-0.3.9.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/cobbler.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cobbler.spec	25 Jan 2007 23:46:16 -0000	1.18
+++ cobbler.spec	29 Jan 2007 18:45:05 -0000	1.19
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.3.8
+Version: 0.3.9
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -13,6 +13,9 @@
 Requires: python-devel
 Requires: createrepo
 Requires: mod_python
+Requires(post):  /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
 BuildRequires: python-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
@@ -21,7 +24,15 @@
 
 %description
 
-Cobbler is a command line tool for configuration of network boot and update servers.  It 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, kickstart monitoring, and auto-managing dhcpd.conf.
+Cobbler is a command line tool for configuration of network \
+boot and update servers.  It is also available 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 rsync mirrors, kickstart templating, \
+integrated yum mirroring, kickstart monitoring, and auto-managing \
+dhcpd.conf.
 
 %prep
 %setup -q
@@ -34,10 +45,18 @@
 %{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
 
 %post
-chkconfig --add cobblersyslogd
+/sbin/chkconfig --add cobblersyslogd
 
 %preun
-chkconfig --del cobblersyslogd
+if [ $1 = 0 ]; then
+    /sbin/service cobblersyslogd stop >/dev/null 2>&1 || :
+    chkconfig --del cobblersyslogd
+fi
+
+%postun
+if [ "$1" -ge "1" ]; then
+    /sbin/service cobblersyslogd condrestart >/dev/null 2>&1 || :
+fi
 
 %clean
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
@@ -72,6 +91,11 @@
 
 %changelog
 
+* Mon Jan 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.3.9-1
+- Changed init script pre/post code to match FC-E guidelines/example
+- Shortened RPM description
+- (also see CHANGELOG)
+
 * Thu Jan 24 2007 Michael DeHaan <mdehaan at redhat.com> - 0.3.8-1
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	25 Jan 2007 23:46:16 -0000	1.19
+++ sources	29 Jan 2007 18:45:05 -0000	1.20
@@ -1 +1 @@
-b17c78821dddc20fe21babc3f2387136  cobbler-0.3.8.tar.gz
+5c168ec21f853b422190eca65de0432f  cobbler-0.3.9.tar.gz