Changeset 1499


Ignore:
Timestamp:
Feb 28, 2010, 6:09:13 AM (12 years ago)
Author:
mitchb
Message:
Upgrade Apache from 2.2.13-1 to 2.2.14-1
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/fedora/specs/httpd.spec.patch

    r1482 r1499  
    1 --- httpd.spec.orig     2009-11-08 08:58:40.000000000 -0500
    2 +++ httpd.spec  2009-11-08 09:00:43.000000000 -0500
     1--- httpd.spec.orig     2010-02-28 05:01:55.000000000 -0500
     2+++ httpd.spec  2010-02-28 05:03:44.000000000 -0500
    33@@ -7,7 +7,7 @@
    44 Summary: Apache HTTP Server
    55 Name: httpd
    6  Version: 2.2.13
     6 Version: 2.2.14
    77-Release: 1%{?dist}
    88+Release: 1.scripts.%{scriptsversion}%{?dist}
     
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
    1111 Source1: index.html
    12 @@ -55,6 +55,13 @@
     12@@ -57,6 +57,13 @@
    1313 Conflicts: pcre < 4.0
    1414 Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
     
    2424 The Apache HTTP Server is a powerful, efficient, and extensible
    2525 web server.
    26 @@ -101,6 +107,7 @@
    27  BuildRequires: openssl-devel, distcache-devel
     26@@ -104,6 +111,7 @@
    2827 Requires(post): openssl >= 0.9.7f-4, /bin/cat
     28 Requires(pre): httpd
    2929 Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
    3030+Provides: scripts-mod_ssl
     
    3232 
    3333 %description -n mod_ssl
    34 @@ -128,6 +135,12 @@
     34@@ -133,6 +141,12 @@
    3535 # Patch in vendor/release string
    3636 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     
    4545 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    4646 if test "x${vmmn}" != "x%{mmn}"; then
    47 @@ -176,10 +188,12 @@
     47@@ -181,10 +195,12 @@
    4848         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    4949        --enable-suexec --with-suexec \
Note: See TracChangeset for help on using the changeset viewer.