[cobbler: 3/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/cobbler

[jimi]

commit 910ce63741b47865e4545aa78a3ccfe8418f9cc3
Merge: dd732fb 2286baf
Author: James Cammarata <jimi at sngx.net>
Date:   Wed Apr 3 21:01:42 2013 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/cobbler
    
    Conflicts:
    	cobbler.spec

 cobbler-httpd24.patch |   45 +++++++++++++++++++++++++++++++++++++++++++++
 cobbler.spec          |    8 ++++++++
 2 files changed, 53 insertions(+), 0 deletions(-)
---
diff --cc cobbler.spec
index e72bb9d,f7c62fc..88a207c
--- a/cobbler.spec
+++ b/cobbler.spec
@@@ -8,8 -8,12 +8,12 @@@ Name: cobble
  License: GPLv2+
  AutoReq: no
  Version: 2.4.0
 -Release: beta3%{?dist}.2
 +Release: beta4%{?dist}
  Source0: http://shenson.fedorapeople.org/cobbler/cobbler-%{version}.tar.gz
+ 
+ # Make httpd configuration compatible with Apache 2.2/2.4
+ Patch0: %{name}-httpd24.patch
+ 
  Group: Applications/System
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  BuildArch: noarch