rpms/cobbler/EL-4 cobbler.spec,1.34,1.35 sources,1.31,1.32

Michael DeHaan (mdehaan) fedora-extras-commits at redhat.com
Thu Jan 10 21:54:24 UTC 2008


Author: mdehaan

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

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/EL-4/cobbler.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cobbler.spec	10 Jan 2008 21:12:56 -0000	1.34
+++ cobbler.spec	10 Jan 2008 21:53:43 -0000	1.35
@@ -2,7 +2,7 @@
 Summary: Boot server configurator
 Name: cobbler
 Version: 0.6.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2+
 Group: Applications/System
@@ -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
@@ -187,11 +192,17 @@
 %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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cobbler/EL-4/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	10 Jan 2008 21:12:56 -0000	1.31
+++ sources	10 Jan 2008 21:53:43 -0000	1.32
@@ -1 +1 @@
-9150237a03bdb56ee885090e412b1020  cobbler-0.6.5.tar.gz
+bfc2f6e06ec3084f0ea8696aa4281495  cobbler-0.6.5.tar.gz




More information about the fedora-extras-commits mailing list