[php-pear-File-Find] fix FTBFS, #843253

[Remi Collet]

commit bbe333e8d61e05cc5bd9aa7c66499f949c8adb03
Author: remi <fedora at famillecollet.com>
Date:   Fri Jul 27 09:40:02 2012 +0200

    fix FTBFS, #843253

 .gitignore              |    3 ++-
 php-pear-File-Find.spec |   29 ++++++++++++++++-------------
 2 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9a40004..e171a2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*spec~
+package-*.xml
 File_Find-1.3.0.tgz
 /File_Find-1.3.1.tgz
-package.xml
diff --git a/php-pear-File-Find.spec b/php-pear-File-Find.spec
index a1f0731..23a8285 100644
--- a/php-pear-File-Find.spec
+++ b/php-pear-File-Find.spec
@@ -13,6 +13,9 @@ URL:            http://pear.php.net/package/File_Find
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source2:        xml2changelog
 
+# See https://pear.php.net/bugs/19530 - Array to string conversion
+Patch0:         %{pear_name}.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -39,13 +42,11 @@ sympathiques.
 %setup -c -q
 %{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 5
 
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
-
 cd %{pear_name}-%{version}
 # package.xml is V2
 mv ../package.xml %{name}.xml
+sed -i -e '/Find.php/s/md5sum=".*" name/name/' %{name}.xml
+%patch0 -p0
 
 
 %build
@@ -56,14 +57,14 @@ mv ../package.xml %{name}.xml
 rm -rf %{buildroot} docdir
 
 pushd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-%{__mkdir_p} %{buildroot}%{pear_xmldir}
-%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+mkdir -p %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 popd
 
@@ -73,11 +74,8 @@ rm -rf %{buildroot}
 
 
 %check
-lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
-[ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
-
 cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} \
+%{__pear} \
    run-tests \
    -i "-d include_path=%{buildroot}%{pear_phpdir}:%{pear_phpdir}" \
    tests | tee ../tests.log
@@ -105,6 +103,11 @@ fi
 
 
 %changelog
+* Fri Jul 27 2012 Remi Collet <Fedora at FamilleCollet.com> 1.3.1-4
+- fix "Array to string conversion" (upstream bug #19530)
+- fix FTBFS (#843253)
+- spec cleanup
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
@@ -114,13 +117,13 @@ fi
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Tue Oct 05 2020 Remi Collet <Fedora at FamilleCollet.com> 1.3.1-1
+* Tue Oct 05 2010 Remi Collet <Fedora at FamilleCollet.com> 1.3.1-1
 - upstream Version 1.3.1 (stable) - API 1.3.0 (stable)
 - package.xml is now V2
 - set timezone during build
 - run tests in %%check
 
-* Sat May 22 2020 Remi Collet <Fedora at FamilleCollet.com> 1.3.0-4
+* Sat May 22 2010 Remi Collet <Fedora at FamilleCollet.com> 1.3.0-4
 - spec cleanup
 - rename File_Find.xml to php-pear-File-Find.xml