Changeset 1949 for branches


Ignore:
Timestamp:
Aug 19, 2011, 8:39:16 AM (13 years ago)
Author:
achernya
Message:
Update httpd.spec.patch for httpd 2.2.19
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/fc15-dev/server/fedora/specs/httpd.spec.patch

    r1807 r1949  
    1 --- httpd.spec.orig     2010-10-27 08:26:15.000000000 -0400
    2 +++ httpd.spec  2010-11-18 18:20:43.000000000 -0500
     1--- httpd.spec.orig     2011-08-19 08:36:24.000000000 -0400
     2+++ httpd.spec  2011-08-19 08:37:34.000000000 -0400
    33@@ -8,7 +8,7 @@
    44 Summary: Apache HTTP Server
    55 Name: httpd
    6  Version: 2.2.17
    7 -Release: 10%{?dist}.1
    8 +Release: 10%{?dist}.1.scripts.%{scriptsversion}
     6 Version: 2.2.19
     7-Release: 2%{?dist}
     8+Release: 2%{?dist}.scripts.%{scriptsversion}
    99 URL: http://httpd.apache.org/
    10  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
     10 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
    1111 Source1: index.html
    12 @@ -54,6 +54,14 @@
     12@@ -52,6 +52,14 @@
    1313 Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
    1414 Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units
     
    2525 The Apache HTTP Server is a powerful, efficient, and extensible
    2626 web server.
    27 @@ -64,6 +72,7 @@
     27@@ -62,6 +70,7 @@
    2828 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    2929 Requires: apr-devel, apr-util-devel, pkgconfig
     
    3333 %description devel
    3434 The httpd-devel package contains the APXS binary and other files
    35 @@ -102,6 +102,7 @@
     35@@ -100,6 +109,7 @@
    3636 Requires(post): openssl, /bin/cat
    3737 Requires(pre): httpd
     
    4141 
    4242 %description -n mod_ssl
    43 @@ -129,6 +139,13 @@
     43@@ -125,6 +135,13 @@
    4444 # Patch in vendor/release string
    4545 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     
    5555 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    5656 if test "x${vmmn}" != "x%{mmn}"; then
    57 @@ -176,10 +193,12 @@
     57@@ -172,10 +189,12 @@
    5858         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    5959        --enable-suexec --with-suexec \
Note: See TracChangeset for help on using the changeset viewer.