rpms/cobbler/F-8 cobbler.spec,1.33,1.34 sources,1.31,1.32

[Michael DeHaan (mdehaan)]

Author: mdehaan

Update of /cvs/extras/rpms/cobbler/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31670/F-8

Modified Files:
	cobbler.spec sources 
Log Message:
Updated to include new Python egg stuff needed for F9




Index: cobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/cobbler.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- cobbler.spec	14 Nov 2007 20:20:27 -0000	1.33
+++ cobbler.spec	10 Jan 2008 21:54:07 -0000	1.34
@@ -1,7 +1,7 @@
 %{!?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.4
+Version: 0.6.5
 Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
@@ -23,6 +23,11 @@
 BuildRequires: redhat-rpm-config
 BuildRequires: python-devel
 BuildRequires: python-cheetah
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 ExcludeArch: ppc
@@ -91,7 +96,7 @@
 %defattr(444,apache,apache)
 /usr/share/cobbler/webui_templates/*.tmpl
 
-%defattr(4755,apache,apache)
+%defattr(755,apache,apache)
 %dir /var/log/cobbler
 %dir /var/log/cobbler/kicklog
 %dir /var/www/cobbler/
@@ -187,11 +192,21 @@
 %config(noreplace) /var/lib/cobbler/cobbler_hosts
 
 %defattr(-,root,root)
+%if 0%{?fedora} > 8
+%{python_sitearch}/cobbler*.egg-info
+%endif
 %doc AUTHORS CHANGELOG README COPYING
 
 
 %changelog
 
+* Thu Jan 10 2008 Michael DeHaan <mdehaan at redhat.com> - 0.6.5-2
+- added python-setuptools stanza for F9
+
+* Thu Jan 10 2008 Michael DeHaan <mdehaan at redhat.com> - 0.6.5-1
+- Upstream changes (see CHANGELOG)
+- simplify directory permissions
+
 * Wed Nov 14 2007 Michael DeHaan <mdehaan at redhat.com> - 0.6.4-2
 - Upstream changes (see CHANGELOG)
 - Permissions changes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/F-8/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	10 Jan 2008 21:13:26 -0000	1.31
+++ sources	10 Jan 2008 21:54:07 -0000	1.32
@@ -1 +1 @@
-9150237a03bdb56ee885090e412b1020  cobbler-0.6.5.tar.gz
+bfc2f6e06ec3084f0ea8696aa4281495  cobbler-0.6.5.tar.gz