Changeset 2462


Ignore:
Timestamp:
Sep 13, 2013, 5:28:30 PM (9 years ago)
Author:
tboning
Message:
Updated httpd.spec.patch for upstream changes
File:
1 edited

Legend:

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

    r2431 r2462  
    1 --- httpd.spec.orig     2013-06-13 00:09:01.645740322 -0400
    2 +++ httpd.spec  2013-06-13 00:11:16.001740322 -0400
     1--- httpd.spec.orig     2013-08-22 16:53:46.414957922 -0400
     2+++ httpd.spec  2013-08-22 16:53:54.456957922 -0400
    33@@ -14,7 +14,7 @@
    44 Summary: Apache HTTP Server
    55 Name: httpd
    6  Version: 2.4.4
    7 -Release: 6%{?dist}
    8 +Release: 6%{?dist}.scripts.%{scriptsversion}
     6 Version: 2.4.6
     7-Release: 2%{?dist}
     8+Release: 2%{?dist}.scripts.%{scriptsversion}
    99 URL: http://httpd.apache.org/
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
    1111 Source1: index.html
    12 @@ -85,6 +85,12 @@
     12@@ -83,6 +83,12 @@
    1313 Requires(postun): systemd-units
    1414 Requires(post): systemd-units
     
    2323 The Apache HTTP Server is a powerful, efficient, and extensible
    2424 web server.
    25 @@ -95,6 +101,7 @@
     25@@ -93,6 +99,7 @@
    2626 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    2727 Requires: apr-devel, apr-util-devel, pkgconfig
     
    3131 %description devel
    3232 The httpd-devel package contains the APXS binary and other files
    33 @@ -133,6 +140,7 @@
     33@@ -131,6 +138,7 @@
    3434 Requires(post): openssl, /bin/cat
    3535 Requires(pre): httpd
     
    3939 
    4040 %description -n mod_ssl
    41 @@ -201,6 +209,11 @@
     41@@ -197,6 +205,11 @@
    4242 # Prevent use of setcap in "install-suexec-caps" target.
    4343 sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
     
    5151 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    5252 if test "x${vmmn}" != "x%{mmn}"; then
    53 @@ -247,11 +260,13 @@
     53@@ -243,11 +256,13 @@
    5454        --enable-suexec --with-suexec \
    5555         --enable-suexec-capabilities \
Note: See TracChangeset for help on using the changeset viewer.