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

[Michael DeHaan (mdehaan)]

Author: mdehaan

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

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Upstream to 0.4.0 (see CHANGELOG)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	29 Jan 2007 18:45:05 -0000	1.19
+++ .cvsignore	19 Feb 2007 19:17:38 -0000	1.20
@@ -16,3 +16,4 @@
 cobbler-0.3.7.tar.gz
 cobbler-0.3.8.tar.gz
 cobbler-0.3.9.tar.gz
+cobbler-0.4.0.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/cobbler.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cobbler.spec	29 Jan 2007 19:03:39 -0000	1.20
+++ cobbler.spec	19 Feb 2007 19:17:38 -0000	1.21
@@ -2,8 +2,8 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.3.9
-Release: 2%{?dist}
+Version: 0.4.0
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/System
@@ -47,6 +47,7 @@
 %post
 /sbin/chkconfig --add cobblersyslogd
 
+
 %preun
 if [ $1 = 0 ]; then
     /sbin/service cobblersyslogd stop >/dev/null 2>&1 || :
@@ -65,7 +66,19 @@
 %defattr(-,apache,apache)
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
+%dir /var/www/cobbler/
+%dir /var/www/cobbler/localmirror
+%dir /var/www/cobbler/kickstarts
+%dir /var/www/cobbler/kickstarts_sys
+%dir /var/www/cobbler/repo_mirror
+%dir /var/www/cobbler/ks_mirror
+%dir /var/www/cobbler/images
+%dir /var/www/cobbler/distros
+%dir /var/www/cobbler/profiles
+%dir /var/www/cobbler/systems
 %defattr(-,root,root)
+%dir /tftpboot/pxelinux.cfg
+%dir /tftpboot/images
 %{_bindir}/cobbler
 %{_bindir}/cobbler_syslogd
 %dir /etc/cobbler
@@ -74,12 +87,18 @@
 %config(noreplace) /etc/cobbler/kickstart_fc6.ks
 %config(noreplace) /etc/cobbler/kickstart_fc6_domU.ks
 %config(noreplace) /etc/cobbler/dhcp.template
-%config(noreplace) /etc/cobbler/default.pxe
 %config(noreplace) /etc/cobbler/rsync.exclude
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
+%dir %{python_sitelib}/cobbler/Cheetah
 %{python_sitelib}/cobbler/*.py*
 %{python_sitelib}/cobbler/yaml/*.py*
+%{python_sitelib}/cobbler/Cheetah/*.py*
+%{python_sitelib}/cobbler/Cheetah/Macros/*.py*
+%{python_sitelib}/cobbler/Cheetah/Templates/*.py*
+%{python_sitelib}/cobbler/Cheetah/Tests/*.py*
+%{python_sitelib}/cobbler/Cheetah/Tools/*.py*
+%{python_sitelib}/cobbler/Cheetah/Utils/*.py*
 %{_mandir}/man1/cobbler.1.gz
 %dir /var/lib/cobbler
 /var/lib/cobbler/elilo-3.6-ia64.efi
@@ -91,6 +110,11 @@
 
 %changelog
 
+* Mon Feb 19 2007 Michael DeHaan <mdehaan at redhat.com> - 0.4.0-1
+- Upstream changes (see CHANGELOG)
+- Cobbler RPM now owns various directories it uses versus creating them using commands.
+- Bundling a copy of Cheetah for older distros
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-6/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	29 Jan 2007 18:45:05 -0000	1.20
+++ sources	19 Feb 2007 19:17:38 -0000	1.21
@@ -1 +1 @@
-5c168ec21f853b422190eca65de0432f  cobbler-0.3.9.tar.gz
+2f3773f5572237647a17bfec45e2d22d  cobbler-0.4.0.tar.gz