[php-pear-Crypt-CHAP/f13/master] update to 1.5.0

[Remi Collet]

commit c4b8fdc0fa235c8cf68d034e5a440bb7e9f3ec73
Author: remi <fedora at famillecollet.com>
Date:   Sun Sep 19 08:54:43 2010 +0200

    update to 1.5.0

 .gitignore               |    1 +
 php-pear-Crypt-CHAP.spec |   43 +++++++++++++++++++++++++++++++++----------
 sources                  |    2 +-
 3 files changed, 35 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 88b93f6..dd6696a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Crypt_CHAP-1.0.2.tgz
+package.xml
diff --git a/php-pear-Crypt-CHAP.spec b/php-pear-Crypt-CHAP.spec
index e216969..3afa258 100644
--- a/php-pear-Crypt-CHAP.spec
+++ b/php-pear-Crypt-CHAP.spec
@@ -1,8 +1,8 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Crypt_CHAP
+%global pear_name Crypt_CHAP
 
 Name:           php-pear-Crypt-CHAP
-Version:        1.0.2
+Version:        1.5.0
 Release:        1%{?dist}
 Summary:        Class to generate CHAP packets
 
@@ -10,26 +10,35 @@ Group:          Development/Languages
 License:        BSD
 URL:            http://pear.php.net/package/Crypt_CHAP
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
-Requires:       php-pear(PEAR) php-mcrypt
+
+Requires:       php-pear(PEAR) 
+Requires:       php-mcrypt >= 5.1.2
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
 
+
 %description
-This package provides Classes for generating CHAP packets.  Currently these
-types of CHAP are supported: CHAP-MD5, MS-CHAPv1, MS-CHAPv2. For MS-CHAP the
-mhash and mcrypt extensions must be loaded.
+This package provides Classes for generating CHAP packets.  
+Currently these types of CHAP are supported: 
+- CHAP-MD5, 
+- MS-CHAPv1, 
+- MS-CHAPv2. 
 
 
 %prep
 %setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+# 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
 
 
 %build
@@ -40,7 +49,7 @@ cd %{pear_name}-%{version}
 %install
 cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 
 # Clean up unnecessary files
@@ -55,6 +64,13 @@ install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 rm -rf $RPM_BUILD_ROOT
 
 
+%check
+cd %{pear_name}-%{version}
+PHPRC=../php.ini %{__pear} run-tests \
+   -i "-d include_path=%{buildroot}%{pear_phpdir}:%{pear_phpdir}" \
+   tests
+
+
 %post
 %{__pear} install --nodeps --soft --force --register-only \
     %{pear_xmldir}/%{name}.xml >/dev/null || :
@@ -74,6 +90,13 @@ fi
 
 
 %changelog
+* Sun Sep 19 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.5.0-1
+- upstream 1.5.0 with patches merged
+- clean define
+- set date.timezone during build
+- review desc. (remove ref to mhash)
+- run tests during %%check
+
 * Sun Aug 30 2009 Christopher Stone <chris.stone at gmail.com> 1.0.2-1
 - Upstream sync
 
diff --git a/sources b/sources
index de13293..c68ab0d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4175a1d5486f305831adba517009c253  Crypt_CHAP-1.0.2.tgz
+6706a6aad9a576a2f9a13b2d9c936e93  Crypt_CHAP-1.5.0.tgz