[cobbler] 2.0.7 release of cobbler
Scott Henson
shenson at fedoraproject.org
Mon Oct 18 15:11:15 UTC 2010
commit 5729e77794258031a8100b7dd442239c07592e38
Author: Scott Henson <shenson at redhat.com>
Date: Mon Oct 18 11:11:07 2010 -0400
2.0.7 release of cobbler
.gitignore | 1 +
cobbler.spec | 30 ++++++++++++++++++++++++------
sources | 3 +--
3 files changed, 26 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 248eef7..db5ad9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
cobbler-2.0.4.tar.gz
cobbler-2.0.5.tar.gz
+/cobbler-2.0.7.tar.gz
diff --git a/cobbler.spec b/cobbler.spec
index 52ee8fa..1e35bf5 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -6,8 +6,8 @@ Summary: Boot server configurator
Name: cobbler
License: GPLv2+
AutoReq: no
-Version: 2.0.5
-Release: 2%{?dist}
+Version: 2.0.7
+Release: 1%{?dist}
Source0: cobbler-%{version}.tar.gz
Group: Applications/System
Requires: python >= 2.3
@@ -18,6 +18,11 @@ Requires: tftp
%else
Requires: httpd
Requires: tftp-server
+%endif
+
+%if 0%{?rhel} >= 6
+Requires: mod_wsgi
+%else
Requires: mod_python
%endif
@@ -159,6 +164,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%dir /var/www/cobbler/svc/
%dir /var/www/cobbler/rendered/
/var/www/cobbler/svc/*.py*
+/var/www/cobbler/svc/*.wsgi*
%defattr(755,root,root)
%dir /usr/share/cobbler/installer_templates
@@ -221,11 +227,19 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%endif
%{_mandir}/man1/cobbler.1.gz
/etc/init.d/cobblerd
+
%if 0%{?suse_version} >= 1000
%config(noreplace) /etc/apache2/conf.d/cobbler.conf
%else
+%if 0%{?rhel} >= 6
+%config(noreplace) /etc/httpd/conf.d/cobbler_wsgi.conf
+%exclude /etc/httpd/conf.d/cobbler.conf
+%else
%config(noreplace) /etc/httpd/conf.d/cobbler.conf
+%exclude /etc/httpd/conf.d/cobbler_wsgi.conf
+%endif
%endif
+
%dir /var/log/cobbler/syslog
%dir /var/log/cobbler/anamon
@@ -288,7 +302,7 @@ 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
+%if 0%{?fedora} > 8 || 0%{?rhel} >= 6
%{python_sitelib}/cobbler*.egg-info
%endif
%doc AUTHORS CHANGELOG README COPYING
@@ -348,7 +362,11 @@ Summary: Web interface for Cobbler
Group: Applications/System
Requires: cobbler
Requires: Django
-BuildRequires: python-devel
+%if 0%{?suse_version} >= 1000
+Requires: apache2-mod_python
+%else
+Requires: mod_python
+%endif
%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Requires: python(abi) >= %{pyver}
@@ -379,8 +397,8 @@ Web interface for Cobbler that allows visiting http://server/cobbler_web to conf
%doc AUTHORS COPYING CHANGELOG README
%changelog
-* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 2.0.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+* Wed Oct 18 2010 Scott Henson <shenson at redhat.com> - 2.0.7-1
+- Bug fix relase, see Changelog for details
* Tue Jul 13 2010 Scott Henson <shenson at redhat.com> - 2.0.5-1
- Bug fix release, see Changelog for details
diff --git a/sources b/sources
index dc04bc9..4e3ccc9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-b08b2b6a4fac2affb61c9760a152558b cobbler-2.0.4.tar.gz
-ced1c9b9dcbddad647e501ead02c64f0 cobbler-2.0.5.tar.gz
+a4e05e5a8b9d69235502c8b6f0065aee cobbler-2.0.7.tar.gz
More information about the scm-commits
mailing list