Ignore:
Timestamp:
May 26, 2014, 3:16:42 AM (10 years ago)
Author:
achernya
Message:
Modernize spec files for F20
File:
1 edited

Legend:

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

    r2462 r2525  
    1 --- httpd.spec.orig     2013-08-22 16:53:46.414957922 -0400
    2 +++ httpd.spec  2013-08-22 16:53:54.456957922 -0400
    3 @@ -14,7 +14,7 @@
     1--- httpd.spec.orig     2014-05-25 18:59:21.318657218 -0400
     2+++ httpd.spec  2014-05-25 19:00:15.324430542 -0400
     3@@ -15,7 +15,7 @@
    44 Summary: Apache HTTP Server
    55 Name: httpd
    6  Version: 2.4.6
     6 Version: 2.4.9
    77-Release: 2%{?dist}
    88+Release: 2%{?dist}.scripts.%{scriptsversion}
     
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
    1111 Source1: index.html
    12 @@ -83,6 +83,12 @@
    13  Requires(postun): systemd-units
     12@@ -86,6 +86,12 @@
    1413 Requires(post): systemd-units
     14 Conflicts: apr < 1.5.0-1
    1515 
    1616+Provides: scripts-httpd = %{version}-%{release}
     
    2323 The Apache HTTP Server is a powerful, efficient, and extensible
    2424 web server.
    25 @@ -93,6 +99,7 @@
     25@@ -96,6 +102,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 @@ -131,6 +138,7 @@
     33@@ -134,6 +141,7 @@
    3434 Requires(post): openssl, /bin/cat
    3535 Requires(pre): httpd
     
    3939 
    4040 %description -n mod_ssl
    41 @@ -197,6 +205,11 @@
     41@@ -200,6 +208,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 @@ -243,11 +256,13 @@
     53@@ -246,11 +259,13 @@
    5454        --enable-suexec --with-suexec \
    5555         --enable-suexec-capabilities \
Note: See TracChangeset for help on using the changeset viewer.