simplify packaging again by recreating the patch against the new apache source dir and this way also merging together the two patches against src/Configure

apache/apache.patch

@@ -1,6 +1,7 @@
---- apache_1.3.31/configure.orig	Tue May 21 14:24:59 2002
-+++ apache_1.3.31/configure	Mon Feb 10 11:08:40 2003
-@@ -1216,10 +1216,10 @@
+Index: apache_1.3.32/configure
+--- apache_1.3.32/configure.orig	2004-02-20 23:40:50 +0100
++++ apache_1.3.32/configure	2004-10-22 11:53:40 +0200
+@@ -1174,10 +1174,10 @@
  ##   or we cannot support the case where the relative
  ##   path is just the emtpy one, i.e. ""]
  ##
@@ -15,9 +16,10 @@
  
  ##
  ##  check and debug
---- apache_1.3.31/src/Configure.dist	2003-06-11 11:59:51.000000000 +0200
-+++ apache_1.3.31/src/Configure	2003-06-11 12:46:14.000000000 +0200
-@@ -1190,14 +1190,20 @@
+Index: apache_1.3.32/src/Configure
+--- apache_1.3.32/src/Configure.orig	2004-09-16 01:45:17 +0200
++++ apache_1.3.32/src/Configure	2004-10-22 11:53:40 +0200
+@@ -1157,14 +1157,20 @@
  	    SHLIB_SUFFIX_DEPTH=0
  	    ;;
  	*-solaris2*)
@@ -44,21 +46,7 @@
  	    SHLIB_SUFFIX_DEPTH=1
  	    ;;
  	*-sunos4*)
---- apache_1.3.31/src/main/util_script.c.orig	Mon Jul 28 17:13:56 2003
-+++ apache_1.3.31/src/main/util_script.c	Tue Jul 29 15:55:27 2003
-@@ -246,6 +246,7 @@
- 	}
-     }
- 
-+    if (!(env_path = ap_pstrdup(r->pool, ap_table_get(r->subprocess_env, "PATH"))))
-     if (!(env_path = ap_pstrdup(r->pool, getenv("PATH")))) {
- 	env_path = DEFAULT_PATH;
-     }
-
-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 @@
+@@ -1873,27 +1879,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
@@ -89,3 +77,14 @@ Index: apache_1.3.31/src/Configure
  fi
  
  ####################################################################
+Index: apache_1.3.32/src/main/util_script.c
+--- apache_1.3.32/src/main/util_script.c.orig	2004-02-16 23:29:33 +0100
++++ apache_1.3.32/src/main/util_script.c	2004-10-22 11:53:40 +0200
+@@ -203,6 +203,7 @@
+ 	}
+     }
+ 
++    if (!(env_path = ap_pstrdup(r->pool, ap_table_get(r->subprocess_env, "PATH"))))
+     if (!(env_path = ap_pstrdup(r->pool, getenv("PATH")))) {
+ 	env_path = DEFAULT_PATH;
+     }

apache/apache.spec

@@ -487,9 +487,7 @@ AutoReqProv:  no
 %prep
     #   unpack Apache distribution
     %setup -q -c
-    cd apache_%{V_apache}
-    %patch -p1
-    cd ..
+    %patch -p0
     %{l_shtool} subst \
         -e 's;"Unix";"%{l_openpkg_release -F "OpenPKG/%%s"}";g' \
         apache_%{V_apache}/src/os/unix/os.h