Changeset 2462 for branches/fc19-dev/server/fedora

Timestamp:

Sep 13, 2013, 5:28:30 PM (11 years ago)

Author:

tboning

Message:

Updated httpd.spec.patch for upstream changes

File:

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

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

@@ -1 @@
---- httpd.spec.orig     2013-06-13 00:09:01.645740322 -0400
-+++ httpd.spec  2013-06-13 00:11:16.001740322 -0400
+--- 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 @@
  Summary: Apache HTTP Server
  Name: httpd
- Version: 2.4.4
--Release: 6%{?dist}
-+Release: 6%{?dist}.scripts.%{scriptsversion}
+ Version: 2.4.6
+-Release: 2%{?dist}
++Release: 2%{?dist}.scripts.%{scriptsversion}
  URL: http://httpd.apache.org/
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
-@@ -85,6 +85,12 @@
+@@ -83,6 +83,12 @@
  Requires(postun): systemd-units
  Requires(post): systemd-units
@@ -23 +23 @@
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -95,6 +101,7 @@
+@@ -93,6 +99,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
-@@ -133,6 +140,7 @@
+@@ -131,6 +138,7 @@
  Requires(post): openssl, /bin/cat
  Requires(pre): httpd
@@ -39 +39 @@
  
  %description -n mod_ssl
-@@ -201,6 +209,11 @@
+@@ -197,6 +205,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
-@@ -247,11 +260,13 @@
+@@ -243,11 +256,13 @@
         --enable-suexec --with-suexec \
          --enable-suexec-capabilities \