rpms/cobbler/EL-4 .cvsignore, 1.48, 1.49 cobbler.spec, 1.58, 1.59 sources, 1.58, 1.59

[Michael DeHaan]

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3909/EL-4

Modified Files:
	.cvsignore cobbler.spec sources 
Log Message:
Updating Cobbler to 1.4.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore	19 Dec 2008 17:33:18 -0000	1.48
+++ .cvsignore	9 Jan 2009 17:23:36 -0000	1.49
@@ -45,3 +45,4 @@
 cobbler-1.2.8.tar.gz
 cobbler-1.2.9.tar.gz
 cobbler-1.4.0.tar.gz
+cobbler-1.4.1.tar.gz


Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/cobbler.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- cobbler.spec	19 Dec 2008 17:33:18 -0000	1.58
+++ cobbler.spec	9 Jan 2009 17:23:36 -0000	1.59
@@ -2,8 +2,8 @@
 Summary: Boot server configurator
 Name: cobbler
 AutoReq: no
-Version: 1.4.0
-Release: 2%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -30,8 +30,8 @@
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
-Requires: python(abi)=%{pyver}
+%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)}
+Requires: python(abi) = %{pyver}
 %endif
 %if 0%{?suse_version} < 0
 BuildRequires: redhat-rpm-config
@@ -157,8 +157,10 @@
 %dir /var/www/cobbler/links
 %defattr(755,apache,apache)
 %dir /var/www/cobbler/webui
+%dir /var/www/cobbler/aux
 %defattr(444,apache,apache)
 /var/www/cobbler/webui/*
+/var/www/cobbler/aux/*
 
 %defattr(755,root,root)
 %{_bindir}/cobbler
@@ -197,6 +199,7 @@
 %config(noreplace) /etc/httpd/conf.d/cobbler_svc.conf
 %endif
 %dir /var/log/cobbler/syslog
+%dir /var/log/cobbler/anamon
 
 %defattr(755,root,root)
 %dir /var/lib/cobbler
@@ -262,6 +265,7 @@
 %config(noreplace) /var/lib/cobbler/snippets/func_register_if_enabled
 %config(noreplace) /var/lib/cobbler/snippets/download_config_files
 %config(noreplace) /var/lib/cobbler/snippets/koan_environment
+%config(noreplace) /var/lib/cobbler/snippets/pre_anamon
 %config(noreplace) /var/lib/cobbler/snippets/redhat_register
 /var/lib/cobbler/elilo-3.8-ia64.efi
 /var/lib/cobbler/menu.c32
@@ -281,6 +285,12 @@
 
 %changelog
 
+* Mon Jan 09 2009 Michael DeHaan <mdehaan at redhat.com> - 1.4.1-1
+- Upstream changes (see CHANGELOG)
+
+* Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-4
+- Fix for rawhide python requirement.
+
 * Fri Dec 19 2008 Michael DeHaan <mdehaan at redhat.com> - 1.4.0-2
 - Upstream changes (see CHANGELOG)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources	19 Dec 2008 17:52:48 -0000	1.58
+++ sources	9 Jan 2009 17:23:37 -0000	1.59
@@ -1 +1,2 @@
 6bf3dae4f204b44858ba91faeb8a1ecf  cobbler-1.4.0.tar.gz
+a85b0ddfb7186f7ea5ed327f1be9c6dc  cobbler-1.4.1.tar.gz