diff options
| author | Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com> | 2007-09-14 17:29:10 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@mdehaan.rdu.redhat.com> | 2007-09-14 17:29:10 -0400 |
| commit | 0904cdd86e4eae3d96db0fdec8133d4bd99dc7d6 (patch) | |
| tree | ae94e4e2e09a520dad5f3feb997433b86178425e | |
| parent | a8d6ca4e7fbcdbf0cdcb993598fb261824133fca (diff) | |
| download | third_party-cobbler-0904cdd86e4eae3d96db0fdec8133d4bd99dc7d6.tar.gz third_party-cobbler-0904cdd86e4eae3d96db0fdec8133d4bd99dc7d6.tar.xz third_party-cobbler-0904cdd86e4eae3d96db0fdec8133d4bd99dc7d6.zip | |
More RPM tweaking
| -rw-r--r-- | cobbler.spec | 5 | ||||
| -rw-r--r-- | cobbler/webui/master.py | 4 | ||||
| -rwxr-xr-x | config/cobblerd | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/cobbler.spec b/cobbler.spec index e8e605f..d3dde58 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -4,7 +4,7 @@ Name: cobbler Version: 0.6.2 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz -License: GPL +License: GPLv2+ Group: Applications/System Requires: python >= 2.3 Requires: httpd @@ -82,7 +82,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %defattr(444,apache,apache) /usr/share/cobbler/webui_templates/*.tmpl -%defattr(1755,apache,apache) +%defattr(4755,apache,apache) %dir /var/log/cobbler %dir /var/log/cobbler/kicklog %dir /var/www/cobbler/ @@ -178,6 +178,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT - packaged /var/lib/cobbler/settings as a config file - added BuildRequires of redhat-rpm-config to help src RPM rebuilds on other platforms - permissions cleanup +- make license field conform to rpmlint * Thu Aug 30 2007 Michael DeHaan <mdehaan@redhat.com> - 0.6.1-2 - Upstream changes (see CHANGELOG) diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py index 58de8e0..cec5a67 100644 --- a/cobbler/webui/master.py +++ b/cobbler/webui/master.py @@ -33,8 +33,8 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '2.0rc8' __CHEETAH_versionTuple__ = (2, 0, 0, 'candidate', 8) -__CHEETAH_genTime__ = 1189799645.5265479 -__CHEETAH_genTimestamp__ = 'Fri Sep 14 15:54:05 2007' +__CHEETAH_genTime__ = 1189803313.957711 +__CHEETAH_genTimestamp__ = 'Fri Sep 14 16:55:13 2007' __CHEETAH_src__ = 'webui_templates/master.tmpl' __CHEETAH_srcLastModified__ = 'Fri Sep 14 14:19:18 2007' __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine' diff --git a/config/cobblerd b/config/cobblerd index a55468d..6b52956 100755 --- a/config/cobblerd +++ b/config/cobblerd @@ -7,7 +7,7 @@ ### BEGIN INIT INFO # Provides: cobblerd -# Requires: network +# Required-Start: network, xinetd, httpd # Default-Start: 3 4 5 # Short-Description: daemon for libvirt virtualization API # Description: This is a daemon that a provides remote cobbler API |