apply a UUID fix from apache 2 packaging and fix filesystem layout

apr/apr.patch

@@ -0,0 +1,12 @@
+Index: crypto/getuuid.c
+--- crypto/getuuid.c.orig	2006-04-14 20:01:58 +0200
++++ crypto/getuuid.c	2007-01-10 19:46:27 +0100
+@@ -131,7 +131,7 @@
+ 
+     /* crap. this isn't crypto quality, but it will be Good Enough */
+ 
+-    get_system_time(&time_now);
++    time_now = apr_time_now();
+     srand((unsigned int)(((time_now >> 32) ^ time_now) & 0xffffffff));
+ 
+     return rand() & 0x0FFFF;

apr/apr.spec

@@ -33,7 +33,7 @@ Class:        PLUS
 Group:        Libraries
 License:      Apache
 Version:      1.2.8
-Release:      20061202
+Release:      20070622
 
 #   package options
 %option       with_threads  no
@@ -41,6 +41,7 @@ Release:      20061202
 #   list of sources
 Source0:      http://www.apache.org/dist/apr/apr-%{version}.tar.gz
 Source1:      http://www.apache.org/dist/apr/apr-util-%{version}.tar.gz
+Patch0:       apr.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -73,15 +74,17 @@ Conflicts:    apache2
 %prep
     %setup -q -c
     %setup -q -D -T -a 1
+    %patch -p0 -d apr-util-%{version}
 
 %build
     ( cd apr-%{version}
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
       ./configure \
+          --enable-layout=GNU \
           --prefix=%{l_prefix} \
           --includedir=%{l_prefix}/include/apr \
-          --enable-layout=GNU \
+          --datadir=%{l_prefix}/share/apr \
           --disable-threads \
 %if "%{with_threads}" == "yes"
           --enable-threads \
@@ -96,9 +99,10 @@ Conflicts:    apache2
       CFLAGS="%{l_cflags -O}" \
       ./configure \
           --with-apr=`pwd`/../apr-%{version} \
+          --enable-layout=GNU \
           --prefix=%{l_prefix} \
           --includedir=%{l_prefix}/include/apr \
-          --enable-layout=GNU \
+          --datadir=%{l_prefix}/share/apr \
           --with-expat=%{l_prefix} \
           --disable-shared
       %{l_make} %{l_mflags -O}