[php-pear-Crypt-CHAP/f14/master] merge other changes from master

[Remi Collet]

commit 458c704e40fa84e2f5e3a23a5260261272e19782
Author: remi <fedora at famillecollet.com>
Date:   Sun Sep 19 08:48:40 2010 +0200

    merge other changes from master

 php-pear-Crypt-CHAP.spec |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/php-pear-Crypt-CHAP.spec b/php-pear-Crypt-CHAP.spec
index c28d0f0..3afa258 100644
--- a/php-pear-Crypt-CHAP.spec
+++ b/php-pear-Crypt-CHAP.spec
@@ -1,5 +1,5 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Crypt_CHAP
+%global pear_name Crypt_CHAP
 
 Name:           php-pear-Crypt-CHAP
 Version:        1.5.0
@@ -23,16 +23,22 @@ 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
@@ -43,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