From 3dcb968b83b39c70f363c7af1a013a0389ff282a Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: Mon, 4 Apr 2005 10:07:16 +0000
Subject: [PATCH] * Mon Apr  4 2005 Joe Orton <jorton@redhat.com> 5.0.4-2 - fix
 PEAR installation and bundle PEAR DB-1.7.5 package

---
 .cvsignore |  1 +
 php.spec   | 16 +++++++++++++---
 sources    |  1 +
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 495686f..b082532 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,4 @@ php-5.0.3.tar.gz
 php-5.0.4.tar.gz
 *.rpm
 i386
+DB-1.7.5.tgz
diff --git a/php.spec b/php.spec
index 77ec2cf..1dc1d26 100644
--- a/php.spec
+++ b/php.spec
@@ -7,15 +7,14 @@
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Name: php
 Version: 5.0.4
-Release: 1
+Release: 2
 License: The PHP License
 Group: Development/Languages
 URL: http://www.php.net/
 
 Source0: http://www.php.net/distributions/php-%{version}.tar.gz
-
 Source10: pear-RunTest.php
-
+Source20: http://pear.php.net/get/DB-1.7.5.tgz
 Source50: php.conf
 
 Patch2: php-5.0.1-config.patch
@@ -336,6 +335,14 @@ rm -f ext/standard/tests/file/bug22414.phpt \
 # Missing file in 5.0.4 PEAR bundle:
 cp $RPM_SOURCE_DIR/pear-RunTest.php pear/PEAR/RunTest.php
 
+# Unpack PEAR DB package
+pushd pear
+ tar xzf %{SOURCE20}
+ mv DB-* DB
+ sed '/<file /s,name=",name="DB/,' package.xml > package-DB.xml
+ rm package.xml
+popd
+
 : Build for oci8=%{with_oci8} mssql=%{with_mssql} mhash=%{with_mhash} ibase=%{with_ibase}
 
 %build
@@ -591,6 +598,9 @@ rm files.*
 %endif
 
 %changelog
+* Mon Apr  4 2005 Joe Orton <jorton@redhat.com> 5.0.4-2
+- fix PEAR installation and bundle PEAR DB-1.7.5 package
+
 * Fri Apr  1 2005 Joe Orton <jorton@redhat.com> 5.0.4-1
 - update to 5.0.4 (#153068)
 - add .phps AddType to php.conf (#152973)
diff --git a/sources b/sources
index 5f5f4e1..29eccbf 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 c8f5fa441fd99c1b363bd2a071a0bd97  php-5.0.4.tar.gz
+43954e51f8dcf5c62700268bdc61ac63  DB-1.7.5.tgz