Changeset 959 for server/fedora

Timestamp:

Jan 28, 2009, 12:36:35 AM (16 years ago)

Author:

geofft

Message:

Update httpd.spec.patch for Fedora 10

File:

• server/fedora/specs/httpd.spec.patch (modified) (4 diffs)

server/fedora/specs/httpd.spec.patch

@@ -1 @@
---- httpd.spec.orig     2009-01-01 21:06:31.000000000 -0500
-+++ httpd.spec  2009-01-01 22:52:19.000000000 -0500
-@@ -6,7 +6,7 @@
+--- httpd.spec.orig     2008-10-21 07:47:47.000000000 -0400
++++ httpd.spec  2009-01-28 00:34:06.000000000 -0500
+@@ -9,7 +9,7 @@
  Summary: Apache HTTP Server
  Name: httpd
- Version: 2.2.9
--Release: 1%{?dist}
-+Release: 1%{?dist}.scripts.%{scriptsversion}
+ Version: 2.2.10
+-Release: 2
++Release: 2.scripts.%{scriptsversion}
  URL: http://httpd.apache.org/
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
  Source1: index.html
-@@ -54,6 +54,11 @@
+@@ -58,6 +58,11 @@
  Conflicts: pcre < 4.0
  Requires: httpd-tools = %{version}-%{release}
@@ -22 +22 @@
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -100,6 +105,7 @@
+@@ -104,6 +109,7 @@
  BuildRequires: openssl-devel, distcache-devel
  Requires(post): openssl >= 0.9.7f-4, /bin/cat
@@ -30 +30 @@
  
  %description -n mod_ssl
-@@ -127,6 +133,10 @@
+@@ -132,6 +138,10 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -41 +41 @@
  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
  if test "x${vmmn}" != "x%{mmn}"; then
-@@ -175,10 +185,12 @@
+@@ -180,10 +190,12 @@
          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --enable-suexec --with-suexec \