SPECS (AC-branch): apr-util.spec - 1.2.8 merge from HEAD

[glen]

Author: glen                         Date: Thu Dec  7 10:00:13 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- 1.2.8 merge from HEAD

---- Files affected:
SPECS:
   apr-util.spec (1.51 -> 1.51.2.1) 

---- Diffs:

================================================================
Index: SPECS/apr-util.spec
diff -u SPECS/apr-util.spec:1.51 SPECS/apr-util.spec:1.51.2.1
--- SPECS/apr-util.spec:1.51	Mon Sep 11 09:30:30 2006
+++ SPECS/apr-util.spec	Thu Dec  7 11:00:07 2006
@@ -11,19 +11,18 @@
 Summary:	A companion library to Apache Portable Runtime
 Summary(pl):	Biblioteka towarzysząca Apache Portable Runtime
 Name:		apr-util
-Version:	1.2.7
-Release:	4
+Version:	1.2.8
+Release:	1
 Epoch:		1
 License:	Apache v2.0
 Group:		Libraries
 Source0:	http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2
-# Source0-md5:	a4c527f08ae2298e62a88472291bf066
+# Source0-md5:	b122f35ee6883a216cd2e7d44504521e
 # http://apache.webthing.com/database/apr_dbd_mysql.c
 Source1:	apr_dbd_mysql.c
 Patch0:		%{name}-link.patch
-Patch1:		%{name}-mysql.patch
-Patch2:		%{name}-dso.patch
-Patch3:		%{name}-dbd.patch
+Patch1:		%{name}-dso.patch
+Patch2:		%{name}-dbd.patch
 URL:		http://apr.apache.org/
 BuildRequires:	apr-devel >= 1:1.1.0
 %{?with_mysql:BuildRequires:	apr-devel >= 1:1.2.2-2.6}
@@ -131,7 +130,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %if %{with mysql}
 cp %{SOURCE1} dbd/apr_dbd_mysql.c
 %else
@@ -140,8 +138,8 @@
 %{__sed} -i -e 's/^\(.*gen-build\.py\)/#\1/' buildconf
 %endif
 %if %{with dso}
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %endif
 
 rm -rf xml/expat
@@ -294,6 +292,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51.2.1  2006/12/07 10:00:07  glen
+- 1.2.8 merge from HEAD
+
 Revision 1.51  2006/09/11 07:30:30  arekm
 - rel 4; keep old soname
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apr-util.spec?r1=1.51&r2=1.51.2.1&f=u