rel-eng/packages/cobbler20 | 2 +-
spec-tree/cobbler20/cobbler20.spec | 14 ++++----------
2 files changed, 5 insertions(+), 11 deletions(-)
New commits:
commit 76f8a5bf6580135698fc64700de9a6c55d05eea4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 23 14:56:13 2013 +0100
Automatic commit of package [cobbler20] minor release [2.0.11-7].
diff --git a/rel-eng/packages/cobbler20 b/rel-eng/packages/cobbler20
index d5ec2ce..6d0e7f8 100644
--- a/rel-eng/packages/cobbler20
+++ b/rel-eng/packages/cobbler20
@@ -1 +1 @@
-2.0.11-6 spec-tree/cobbler20/
+2.0.11-7 spec-tree/cobbler20/
diff --git a/spec-tree/cobbler20/cobbler20.spec b/spec-tree/cobbler20/cobbler20.spec
index 25c917f..2d54b7c 100644
--- a/spec-tree/cobbler20/cobbler20.spec
+++ b/spec-tree/cobbler20/cobbler20.spec
@@ -7,7 +7,7 @@ Name: cobbler20
License: GPLv2+
AutoReq: no
Version: 2.0.11
-Release: 6%{?dist}
+Release: 7%{?dist}
Source0: cobbler-%{version}.tar.gz
Patch0: catch_cheetah_exception.patch
Group: Applications/System
@@ -418,6 +418,9 @@ Web interface for Cobbler that allows visiting
http://server/cobbler_web to conf
%doc AUTHORS COPYING CHANGELOG README
%changelog
+* Wed Jan 23 2013 Jan Pazdziora 2.0.11-7
+- Move to mod_wsgi both on Fedoras and on RHEL 5.
+
* Mon Nov 12 2012 Tomas Lestach <tlestach(a)redhat.com> 2.0.11-6
- 866326 - catch xmlrpclib.Fault instead of general Exception in cobbler's
mod_python/mod_wsgi
commit 75db64b8d9093d82c6a96a0c12c6c26c5f081f12
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 23 14:55:54 2013 +0100
Move to mod_wsgi both on Fedoras and on RHEL 5.
diff --git a/spec-tree/cobbler20/cobbler20.spec b/spec-tree/cobbler20/cobbler20.spec
index 89cbccb..25c917f 100644
--- a/spec-tree/cobbler20/cobbler20.spec
+++ b/spec-tree/cobbler20/cobbler20.spec
@@ -25,11 +25,7 @@ Requires: httpd
Requires: tftp-server
%endif
-%if 0%{?rhel} >= 6
Requires: mod_wsgi
-%else
-Requires: mod_python
-%endif
Requires: createrepo
%if 0%{?fedora} >= 11
@@ -237,13 +233,8 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf
$RPM_BUILD_ROOT
%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