[cobbler/f19] New upstream release, 2.4.0-beta5

jimi jimi at fedoraproject.org
Mon Apr 22 15:43:20 UTC 2013


commit 9ca878626b358534d1da8b142e1a8bb2d973e854
Author: James Cammarata <jimi at sngx.net>
Date:   Mon Apr 22 10:34:35 2013 -0500

    New upstream release, 2.4.0-beta5

 cobbler.spec |   22 +++++-----------------
 sources      |    2 +-
 2 files changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/cobbler.spec b/cobbler.spec
index 88a207c..8248985 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -8,12 +8,8 @@ Name: cobbler
 License: GPLv2+
 AutoReq: no
 Version: 2.4.0
-Release: beta4%{?dist}
+Release: beta5%{?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
@@ -77,9 +73,6 @@ other applications.
 %prep
 %setup -q
 
-%patch0 -p1 -b .httpd24
-
-
 %build
 %{__python} setup.py build
 
@@ -336,22 +329,17 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" /usr/share/cobbler/
 %doc AUTHORS COPYING CHANGELOG README
 %config(noreplace) /etc/httpd/conf.d/cobbler_web.conf
 %defattr(-,apache,apache,-)
-%dir /usr/share/cobbler
 /usr/share/cobbler/web
 %dir %attr(700,apache,root) /var/lib/cobbler/webui_sessions
 /var/www/cobbler_webui_content/
 
 %changelog
+* Mon Apr 22 2013 James Cammarata <jimi at sngx.net> 2.4.0-beta5
+- A few bugfixes and rebuilding the RPM because of a goof
+  (jimi at sngx.net)
+
 * Wed Apr 03 2013 James Cammarata <jimi at sngx.net> 2.4.0-beta4
 - 2.4.0-beta4 release
-
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.0-beta3.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Tue Jan  8 2013 Remi Collet <rcollet at redhat.com>  2.4.0-beta3.1
-- fix configuration for httpd 2.4, #871383
-- own /usr/share/cobbler
-
 * Wed Dec 12 2012 James Cammarata <jimi at sngx.net> 2.4.0-beta3
 - New release 2.4.0-beta3
 * Thu Oct 11 2012 James Cammarata <jimi at sngx.net> 2.4.0-beta2
diff --git a/sources b/sources
index 4183bb4..4896a9f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec541e4c6af4603f86cde141f380f96e  cobbler-2.4.0.tar.gz
+ede78f714ddf22e54593512c4b25dabc  cobbler-2.4.0.tar.gz


More information about the scm-commits mailing list