diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-01-10 18:19:33 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-01-10 18:19:33 -0500 |
| commit | 70bfc8f5a3150d09cc064a4c46efcaff80b29904 (patch) | |
| tree | e234407e6263ab738c0236a6041090893d6f84a5 | |
| parent | d5a7a8b892d25fa3c8f8d559c835796ebd6d83a0 (diff) | |
| download | third_party-cobbler-70bfc8f5a3150d09cc064a4c46efcaff80b29904.tar.gz third_party-cobbler-70bfc8f5a3150d09cc064a4c46efcaff80b29904.tar.xz third_party-cobbler-70bfc8f5a3150d09cc064a4c46efcaff80b29904.zip | |
RPM fixing for F9
| -rw-r--r-- | cobbler.spec | 13 | ||||
| -rw-r--r-- | cobbler/webui/master.py | 6 |
2 files changed, 15 insertions, 4 deletions
diff --git a/cobbler.spec b/cobbler.spec index bc584d0..5989399 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -2,7 +2,7 @@ Summary: Boot server configurator Name: cobbler Version: 0.6.5 -Release: 1%{?dist} +Release: 3%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -23,6 +23,11 @@ Requires(preun): /sbin/service 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 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %config(noreplace) /var/lib/cobbler/cobbler_hosts %defattr(-,root,root) +%if 0%{?fedora} > 8 +%{python_sitelib}/cobbler*.egg-info +%endif %doc AUTHORS CHANGELOG README COPYING %changelog +* Thu Jan 10 2008 Michael DeHaan <mdehaan@redhat.com> - 0.6.5-3 +- added python-setuptools stanza for F9 + * Thu Jan 10 2008 Michael DeHaan <mdehaan@redhat.com> - 0.6.5-1 - Upstream changes (see CHANGELOG) - simplify directory permissions diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py index 2bf0b47..397ac19 100644 --- a/cobbler/webui/master.py +++ b/cobbler/webui/master.py @@ -33,10 +33,10 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '2.0.1' __CHEETAH_versionTuple__ = (2, 0, 1, 'final', 0) -__CHEETAH_genTime__ = 1199997755.5177491 -__CHEETAH_genTimestamp__ = 'Thu Jan 10 15:42:35 2008' +__CHEETAH_genTime__ = 1200001429.6167221 +__CHEETAH_genTimestamp__ = 'Thu Jan 10 16:43:49 2008' __CHEETAH_src__ = 'webui_templates/master.tmpl' -__CHEETAH_srcLastModified__ = 'Thu Jan 10 14:40:43 2008' +__CHEETAH_srcLastModified__ = 'Thu Jan 10 16:39:32 2008' __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: |