rpms/cobbler/FC-5 .cvsignore, 1.20, 1.21 cobbler.spec, 1.21, 1.22 sources, 1.20, 1.21

[Michael DeHaan (mdehaan)]

Author: mdehaan

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

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




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	5 Apr 2007 20:06:15 -0000	1.20
+++ .cvsignore	23 Apr 2007 15:06:53 -0000	1.21
@@ -17,3 +17,4 @@
 cobbler-0.4.3.tar.gz
 cobbler-0.4.5.tar.gz
 cobbler-0.4.6.tar.gz
+cobbler-0.4.7.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/cobbler.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cobbler.spec	5 Apr 2007 20:06:15 -0000	1.21
+++ cobbler.spec	23 Apr 2007 15:06:53 -0000	1.22
@@ -1,9 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define _has_yum 1
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.4.6
-Release: 0%{?dist}
+Version: 0.4.7
+Release: 5%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Applications/System
@@ -47,18 +46,18 @@
 %{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add cobblersyslogd
+/sbin/chkconfig --add cobblerd
 
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/service cobblersyslogd stop >/dev/null 2>&1 || :
-    chkconfig --del cobblersyslogd
+    /sbin/service cobblerd stop >/dev/null 2>&1 || :
+    chkconfig --del cobblerd
 fi
 
 %postun
 if [ "$1" -ge "1" ]; then
-    /sbin/service cobblersyslogd condrestart >/dev/null 2>&1 || :
+    /sbin/service cobblerd condrestart >/dev/null 2>&1 || :
 fi
 
 %clean
@@ -80,12 +79,11 @@
 %dir /var/www/cobbler/profiles
 %dir /var/www/cobbler/systems
 %dir /var/www/cobbler/links
-/var/www/cobbler/watcher.py*
 %defattr(-,root,root)
 %dir /tftpboot/pxelinux.cfg
 %dir /tftpboot/images
 %{_bindir}/cobbler
-%{_bindir}/cobbler_syslogd
+%{_bindir}/cobblerd
 %dir /etc/cobbler
 %config(noreplace) /etc/cobbler/default.ks
 %config(noreplace) /etc/cobbler/kickstart_fc5.ks
@@ -102,15 +100,30 @@
 %{python_sitelib}/cobbler/*.py*
 %{python_sitelib}/cobbler/yaml/*.py*
 %{_mandir}/man1/cobbler.1.gz
+/etc/init.d/cobblerd
+/etc/httpd/conf.d/cobbler.conf
+%dir /var/log/cobbler/syslog
+%defattr(2550,root,root)
 %dir /var/lib/cobbler
+%dir /var/lib/cobbler/triggers/add/distro
+%dir /var/lib/cobbler/triggers/add/profile
+%dir /var/lib/cobbler/triggers/add/system
+%dir /var/lib/cobbler/triggers/add/repo
+%dir /var/lib/cobbler/triggers/delete/distro
+%dir /var/lib/cobbler/triggers/delete/profile
+%dir /var/lib/cobbler/triggers/delete/system
+%dir /var/lib/cobbler/triggers/delete/repo
 /var/lib/cobbler/elilo-3.6-ia64.efi
 /var/lib/cobbler/menu.c32
-/etc/init.d/cobblersyslogd
-%dir /var/log/cobbler/syslog
-
+%defattr(-,-,-)
 %doc AUTHORS CHANGELOG NEWS README COPYING
 
+
 %changelog
+* Fri Apr 20 2007 Michael DeHaan <mdehaan at redhat.com> - 0.4.7-5
+- Upstream changes (see CHANGELOG)
+- Added triggers to /var/lib/cobbler/triggers
+
 * Thu Apr 05 2007 Michael DeHaan <mdehaan at redhat.com> - 0.4.6-0
 - Upstream changes (see CHANGELOG)
 - Packaged 'config' directory under ks_mirror


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/FC-5/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	5 Apr 2007 20:06:15 -0000	1.20
+++ sources	23 Apr 2007 15:06:53 -0000	1.21
@@ -1 +1 @@
-61db22da90fdc2f537a6366efa567312  cobbler-0.4.6.tar.gz
+2413fe2eb4f6922873afdb6b5a9b5681  cobbler-0.4.7.tar.gz