瀏覽代碼

fix use-external-Expat patch

Ralf S. Engelschall 21 年之前
父節點
當前提交
2807b575cd
共有 2 個文件被更改,包括 14 次插入5 次删除
  1. 13 4
      apache/apache.patch
  2. 1 1
      apache/apache.spec

+ 13 - 4
apache/apache.patch

@@ -79,10 +79,19 @@ diff -u -r1.106 -r1.107
  
      }
 
-Index: Configure
---- apache_1.3.31/src/Configure.orig	2004-04-09 19:01:50 +0200
-+++ apache_1.3.31/src/Configure	2004-07-06 22:05:44 +0200
-@@ -1869,19 +1875,8 @@
+Index: apache_1.3.31/src/Configure
+--- apache_1.3.31/src/Configure.orig	2004-07-26 14:20:53 +0200
++++ apache_1.3.31/src/Configure	2004-07-26 14:41:24 +0200
+@@ -1867,27 +1867,12 @@
+ # set the default, based on whether expat-lite is bundled. if it is present,
+ # then we can always include expat.
+ if [ "x$RULE_EXPAT" = "xdefault" ]; then
+-    if [ -d ./lib/expat-lite/ ]; then
+-        RULE_EXPAT=yes
+-    else
+-        RULE_EXPAT=no
+-    fi
++    RULE_EXPAT=no
  fi
  
  if [ "x$RULE_EXPAT" = "xyes" ]; then

+ 1 - 1
apache/apache.spec

@@ -66,7 +66,7 @@ Class:        BASE
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20040725
+Release:      20040726
 
 #   package options (suexec related)
 %option       with_suexec               yes