Changeset 1949

Timestamp:

Aug 19, 2011, 8:39:16 AM (13 years ago)

Author:

achernya

Message:

Update httpd.spec.patch for httpd 2.2.19

File:

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

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

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