rpms/php-pear-Crypt-CHAP/devel php-pear-Crypt-CHAP.spec,1.3,1.4

[Remi Collet]

Author: remi

Update of /cvs/extras/rpms/php-pear-Crypt-CHAP/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24609

Modified Files:
	php-pear-Crypt-CHAP.spec 
Log Message:
don't require mhash (optional), fix broken deps


Index: php-pear-Crypt-CHAP.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Crypt-CHAP/devel/php-pear-Crypt-CHAP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- php-pear-Crypt-CHAP.spec	26 Feb 2009 20:51:08 -0000	1.3
+++ php-pear-Crypt-CHAP.spec	13 Jul 2009 21:00:14 -0000	1.4
@@ -3,7 +3,7 @@
 
 Name:           php-pear-Crypt-CHAP
 Version:        1.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Class to generate CHAP packets
 
 Group:          Development/Languages
@@ -14,7 +14,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
-Requires:       php-pear(PEAR) php-mhash php-mcrypt
+Requires:       php-pear(PEAR) php-mcrypt
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -28,7 +28,7 @@ mhash and mcrypt extensions must be load
 %prep
 %setup -qc
 [ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+mv package2.xml %{pear_name}-%{version}/%{name}.xml
 cd %{pear_name}-%{version}
 
 
@@ -40,7 +40,7 @@ cd %{pear_name}-%{version}
 %install
 cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 
 # Clean up unnecessary files
@@ -48,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -57,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -68,12 +68,16 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_testdir}/%{pear_name}
 %{pear_phpdir}/Crypt
 
 
 %changelog
+* Mon Jul 13 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.0.1-3
+- remove mhash dependency (optional, and not provided by php 5.3.0)
+- rename Crypt_CHAP.xml to php-pear-Crypt-CHAP.xml
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild