rpms/cobbler/EL-5 .cvsignore, 1.29, 1.30 cobbler.spec, 1.32, 1.33 sources, 1.30, 1.31

[Michael DeHaan (mdehaan)]

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27434

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
0.6.2




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	30 Aug 2007 16:31:08 -0000	1.29
+++ .cvsignore	28 Sep 2007 21:35:35 -0000	1.30
@@ -26,3 +26,4 @@
 cobbler-0.4.8.tar.gz
 cobbler-0.6.0.tar.gz
 cobbler-0.6.1.tar.gz
+cobbler-0.6.2.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/cobbler.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cobbler.spec	30 Aug 2007 16:31:08 -0000	1.32
+++ cobbler.spec	28 Sep 2007 21:35:35 -0000	1.33
@@ -1,10 +1,10 @@
 %{!?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.6.1
+Version: 0.6.2
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
-License: GPL
+License: GPLv2+
 Group: Applications/System
 Requires: python >= 2.3
 Requires: httpd
@@ -21,7 +21,9 @@
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
+BuildRequires: redhat-rpm-config
 BuildRequires: python-devel
+BuildRequires: python-cheetah
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
@@ -69,9 +71,19 @@
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(2744,apache,apache)
-/var/www/cgi-bin/findks.cgi
-/var/www/cgi-bin/nopxe.cgi
+
+%defattr(755,apache,apache)
+%dir /var/www/cgi-bin/cobbler/
+/var/www/cgi-bin/cobbler/findks.cgi
+/var/www/cgi-bin/cobbler/nopxe.cgi
+/var/www/cgi-bin/cobbler/webui.cgi
+
+%defattr(755,apache,apache)
+%dir /usr/share/cobbler/webui_templates
+%defattr(444,apache,apache)
+/usr/share/cobbler/webui_templates/*.tmpl
+
+%defattr(4755,apache,apache)
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
 %dir /var/www/cobbler/
@@ -86,6 +98,12 @@
 %dir /var/www/cobbler/profiles
 %dir /var/www/cobbler/systems
 %dir /var/www/cobbler/links
+%defattr(755,apache,apache)
+%dir /var/www/cobbler/webui
+%defattr(444,apache,apache)
+/var/www/cobbler/webui/*.css
+/var/www/cobbler/webui/*.png
+/var/www/cobbler/webui/*.html
 %defattr(-,root,root)
 %dir /tftpboot/pxelinux.cfg
 %dir /tftpboot/images
@@ -104,16 +122,24 @@
 %config(noreplace) /etc/cobbler/pxesystem_ia64.template
 %config(noreplace) /etc/cobbler/rsync.exclude
 %config(noreplace) /etc/logrotate.d/cobblerd_rotate
+%config(noreplace) /etc/cobbler/modules.conf
+%config(noreplace) /etc/cobbler/webui-cherrypy.cfg
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
+%dir %{python_sitelib}/cobbler/modules
+%dir %{python_sitelib}/cobbler/webui
 %{python_sitelib}/cobbler/*.py*
 %{python_sitelib}/cobbler/yaml/*.py*
+%{python_sitelib}/cobbler/modules/*.py*
+%{python_sitelib}/cobbler/webui/*.py*
 %{_mandir}/man1/cobbler.1.gz
 /etc/init.d/cobblerd
 %config(noreplace) /etc/httpd/conf.d/cobbler.conf
 %dir /var/log/cobbler/syslog
-%defattr(2550,root,root)
+
+%defattr(755,root,root)
 %dir /var/lib/cobbler
+%dir /var/lib/cobbler/kickstarts/
 %dir /var/lib/cobbler/triggers/add/distro/pre
 %dir /var/lib/cobbler/triggers/add/distro/post
 %dir /var/lib/cobbler/triggers/add/profile/pre
@@ -131,18 +157,34 @@
 %dir /var/lib/cobbler/triggers/delete/repo/pre
 %dir /var/lib/cobbler/triggers/delete/repo/post
 %dir /var/lib/cobbler/snippets/
+
+%defattr(664,root,root)
+%config(noreplace) /var/lib/cobbler/settings
 %config(noreplace) /var/lib/cobbler/snippets/partition_select
 /var/lib/cobbler/elilo-3.6-ia64.efi
 /var/lib/cobbler/menu.c32
-%defattr(2755,root,root)
+%config(noreplace) /etc/cobbler/auth.conf 
+
+%defattr(664,root,root)
 %config(noreplace) /var/lib/cobbler/cobbler_hosts
+
 %defattr(-,root,root)
 %doc AUTHORS CHANGELOG README COPYING
 
 
 %changelog
 
-* Tue Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
+* Fri Sep 28 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.2-2
+- Upstream changes (see CHANGELOG)
+- removed syslinux as a requirement (cobbler check will detect absense)
+- packaged /var/lib/cobbler/settings as a config file
+- added BuildRequires of redhat-rpm-config to help src RPM rebuilds on other platforms
+- permissions cleanup
+- make license field conform to rpmlint
+- relocate cgi-bin files to cobbler subdirectory 
+- include the WUI!
+
+* Thu Aug 30 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.1-2
 - Upstream changes (see CHANGELOG)
 
 * Thu Aug 09 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.0-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	30 Aug 2007 16:31:08 -0000	1.30
+++ sources	28 Sep 2007 21:35:35 -0000	1.31
@@ -1 +1,2 @@
 72d67d4eea242ed3c406f2cced98eb41  cobbler-0.6.1.tar.gz
+4cf9d4e8f97f2e87d85bb675e41f1167  cobbler-0.6.2.tar.gz