Changeset 2525 for branches/fc20-dev/server/fedora/specs/httpd.spec.patch

Timestamp:

May 26, 2014, 3:16:42 AM (10 years ago)

Author:

achernya

Message:

Modernize spec files for F20

File:

• branches/fc20-dev/server/fedora/specs/httpd.spec.patch (modified) (6 diffs)

branches/fc20-dev/server/fedora/specs/httpd.spec.patch

@@ -1 @@
---- httpd.spec.orig     2013-08-22 16:53:46.414957922 -0400
-+++ httpd.spec  2013-08-22 16:53:54.456957922 -0400
-@@ -14,7 +14,7 @@
+--- httpd.spec.orig     2014-05-25 18:59:21.318657218 -0400
++++ httpd.spec  2014-05-25 19:00:15.324430542 -0400
+@@ -15,7 +15,7 @@
  Summary: Apache HTTP Server
  Name: httpd
- Version: 2.4.6
+ Version: 2.4.9
 -Release: 2%{?dist}
 +Release: 2%{?dist}.scripts.%{scriptsversion}
@@ -10 +10 @@
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
-@@ -83,6 +83,12 @@
- Requires(postun): systemd-units
+@@ -86,6 +86,12 @@
  Requires(post): systemd-units
+ Conflicts: apr < 1.5.0-1
  
 +Provides: scripts-httpd = %{version}-%{release}
@@ -23 +23 @@
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -93,6 +99,7 @@
+@@ -96,6 +102,7 @@
  Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
  Requires: apr-devel, apr-util-devel, pkgconfig
@@ -31 +31 @@
  %description devel
  The httpd-devel package contains the APXS binary and other files
-@@ -131,6 +138,7 @@
+@@ -134,6 +141,7 @@
  Requires(post): openssl, /bin/cat
  Requires(pre): httpd
@@ -39 +39 @@
  
  %description -n mod_ssl
-@@ -197,6 +205,11 @@
+@@ -200,6 +208,11 @@
  # Prevent use of setcap in "install-suexec-caps" target.
  sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
@@ -51 +51 @@
  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
  if test "x${vmmn}" != "x%{mmn}"; then
-@@ -243,11 +256,13 @@
+@@ -246,11 +259,13 @@
         --enable-suexec --with-suexec \
          --enable-suexec-capabilities \