Changeset 1146 for branches/fc11-dev/server/fedora/specs

Timestamp:

Jun 3, 2009, 6:46:03 AM (15 years ago)

Author:

mitchb

Message:

Version, context, etc. fixups to build Apache on Fedora 11

File:

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

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

@@ -1 @@
---- httpd.spec.orig     2009-03-28 13:32:47.000000000 -0400
-+++ httpd.spec  2009-03-28 14:20:15.000000000 -0400
-@@ -6,7 +6,7 @@
+--- httpd.spec.orig     2009-03-17 09:12:22.000000000 -0400
++++ httpd.spec  2009-06-03 05:05:30.000000000 -0400
+@@ -7,7 +7,7 @@
  Summary: Apache HTTP Server
  Name: httpd
- Version: 2.2.10
--Release: 1%{?dist}
-+Release: 1%{?dist}.scripts.%{scriptsversion}
+ Version: 2.2.11
+-Release: 8
++Release: 8.scripts.%{scriptsversion}
  URL: http://httpd.apache.org/
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
  Source1: index.html
-@@ -54,6 +54,12 @@
+@@ -56,6 +56,12 @@
  Conflicts: pcre < 4.0
- Requires: httpd-tools = %{version}-%{release}
+ Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
  
 +Provides: scripts-httpd
@@ -23 +23 @@
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -100,6 +106,7 @@
+@@ -102,6 +108,7 @@
  BuildRequires: openssl-devel, distcache-devel
  Requires(post): openssl >= 0.9.7f-4, /bin/cat
@@ -31 +31 @@
  
  %description -n mod_ssl
-@@ -127,6 +134,11 @@
+@@ -130,6 +137,11 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -43 +43 @@
  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 +187,12 @@
+@@ -178,10 +190,12 @@
          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --enable-suexec --with-suexec \