Ignore:
Timestamp:
Jun 3, 2009, 6:46:03 AM (13 years ago)
Author:
mitchb
Message:
Version, context, etc. fixups to build Apache on Fedora 11
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/fc11-dev/server/fedora/specs/httpd.spec.patch

    r1035 r1146  
    1 --- httpd.spec.orig     2009-03-28 13:32:47.000000000 -0400
    2 +++ httpd.spec  2009-03-28 14:20:15.000000000 -0400
    3 @@ -6,7 +6,7 @@
     1--- httpd.spec.orig     2009-03-17 09:12:22.000000000 -0400
     2+++ httpd.spec  2009-06-03 05:05:30.000000000 -0400
     3@@ -7,7 +7,7 @@
    44 Summary: Apache HTTP Server
    55 Name: httpd
    6  Version: 2.2.10
    7 -Release: 1%{?dist}
    8 +Release: 1%{?dist}.scripts.%{scriptsversion}
     6 Version: 2.2.11
     7-Release: 8
     8+Release: 8.scripts.%{scriptsversion}
    99 URL: http://httpd.apache.org/
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
    1111 Source1: index.html
    12 @@ -54,6 +54,12 @@
     12@@ -56,6 +56,12 @@
    1313 Conflicts: pcre < 4.0
    14  Requires: httpd-tools = %{version}-%{release}
     14 Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
    1515 
    1616+Provides: scripts-httpd
     
    2323 The Apache HTTP Server is a powerful, efficient, and extensible
    2424 web server.
    25 @@ -100,6 +106,7 @@
     25@@ -102,6 +108,7 @@
    2626 BuildRequires: openssl-devel, distcache-devel
    2727 Requires(post): openssl >= 0.9.7f-4, /bin/cat
     
    3131 
    3232 %description -n mod_ssl
    33 @@ -127,6 +134,11 @@
     33@@ -130,6 +137,11 @@
    3434 # Patch in vendor/release string
    3535 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     
    4343 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    4444 if test "x${vmmn}" != "x%{mmn}"; then
    45 @@ -175,10 +187,12 @@
     45@@ -178,10 +190,12 @@
    4646         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    4747        --enable-suexec --with-suexec \
Note: See TracChangeset for help on using the changeset viewer.