[php-pear-Validate] update to 0.8.5

[Remi Collet]

commit 9de1fbea863a8704032705776470e2cb9095332e
Author: remi <fedora at famillecollet.com>
Date:   Mon Dec 19 15:56:13 2011 +0100

    update to 0.8.5

 .gitignore             |    5 +++--
 php-pear-Validate.spec |   32 ++++++++++++++------------------
 sources                |    2 +-
 3 files changed, 18 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5e4d6d3..33d4d91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-Validate-0.8.2.tgz
-package.xml
+package-*.xml
+*spec~
 /Validate-0.8.3.tgz
 /Validate-0.8.4.tgz
+/Validate-0.8.5.tgz
diff --git a/php-pear-Validate.spec b/php-pear-Validate.spec
index e5de589..521ad6e 100644
--- a/php-pear-Validate.spec
+++ b/php-pear-Validate.spec
@@ -2,8 +2,8 @@
 %global pear_name Validate
 
 Name:           php-pear-Validate
-Version:        0.8.4
-Release:        4%{?dist}
+Version:        0.8.5
+Release:        1%{?dist}
 Summary:        Validation Class for Various Data Types
 
 Group:          Development/Libraries
@@ -12,7 +12,6 @@ URL:            http://pear.php.net/package/Validate
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source2:        xml2changelog
 
-Patch0:         %{name}.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -42,16 +41,10 @@ Package to validate various data. It includes :
 %setup -qc
 %{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 10
 
-# 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
 
-%patch0 -p1
-
 
 %build
 cd %{pear_name}-%{version}
@@ -59,21 +52,21 @@ cd %{pear_name}-%{version}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-install -d $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -d %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %check
 cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} \
+%{__pear} \
    run-tests \
    -i "-d include_path=%{buildroot}%{pear_phpdir}:%{pear_phpdir}" \
    tests | tee ../tests.log
@@ -82,13 +75,12 @@ if grep -q "FAILED TESTS" ../tests.log; then
   for fic in tests/*.diff; do
     cat $fic; echo -e "\n"
   done
-  # 2 tests failed in mock (domain check) # exit 1
-  # http://pear.php.net/bugs/17963
+  exit 1
 fi
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
@@ -112,6 +104,10 @@ fi
 
 
 %changelog
+* Mon Dec 19 2011 Remi Collet <remi at fedoraproject.org> 0.8.5-1
+- Version 0.8.5 (beta) - API 0.7.0 (beta) - QA release
+- removed merged patch
+
 * Tue Apr 26 2011 Remi Collet <Fedora at FamilleCollet.com> 0.8.4-4
 - doc in /usr/share/doc/pear
 
diff --git a/sources b/sources
index 4380dbe..871b60e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8b3a163980f920fb3e498bff37b14be  Validate-0.8.4.tgz
+3007fbf7debbb7c0fc20622f90096eb9  Validate-0.8.5.tgz