rpms/php-pear-Mail/devel php-pear-Mail.spec,1.3,1.4

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/php-pear-Mail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2156

Modified Files:
	php-pear-Mail.spec 
Log Message:
new and simpler %%prep and %%install



Index: php-pear-Mail.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/devel/php-pear-Mail.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-Mail.spec	28 Aug 2006 14:25:35 -0000	1.3
+++ php-pear-Mail.spec	4 Sep 2006 15:47:20 -0000	1.4
@@ -10,7 +10,7 @@
 Summary(fr): PEAR: Une Classe fournissant des interfaces pour envoyer des emails
 Name:        php-pear-Mail
 Version:     1.1.10
-Release:     6%{?dist}
+Release:     7%{?dist}
 License:     PHP License
 Group:       Development/Libraries
 Source:      http://pear.php.net/get/Mail-%{version}.tgz
@@ -48,33 +48,21 @@
 "php-pear-Net-SMTP" (version >= 1.1.0).
 
 %prep
-%setup -c -q -T
-# XXX Source files location is missing here in pear cmd
-%{__pear} -v -c pearrc \
-        -d php_dir=%{pear_phpdir} \
-        -d doc_dir=%{pear_docdir} \
-        -d bin_dir=%{_bindir} \
-        -d data_dir=%{pear_datadir} \
-        -d test_dir=%{pear_testdir} \
-        -d ext_dir=%{_libdir} \
-        -s
+%setup -q -n Mail-%{version}
+mv ../package.xml .
 
 %{__install} -m 644 -c %{SOURCE1} LICENSE
 
 %install
 rm -rf %{buildroot}
-%{__pear} -c pearrc install --nodeps --packagingroot %{buildroot} %{SOURCE0}
+%{__pear} install --nodeps --packagingroot %{buildroot} package.xml
 
-rm -f %{buildroot}%{pear_phpdir}/.filemap
-rm -f %{buildroot}%{pear_phpdir}/.lock
-rm -rf %{buildroot}%{pear_phpdir}/.registry
-rm -rf %{buildroot}%{pear_phpdir}/.channels
-rm %{buildroot}%{pear_phpdir}/.depdb
-rm %{buildroot}%{pear_phpdir}/.depdblock
+# Clean up unnecessary files
+rm -rf %{buildroot}%{pear_phpdir}/.??*
 
+# Install XML package description
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
-tar -xzf %{SOURCE0} package.xml
-cp -p package.xml %{buildroot}%{pear_xmldir}/Mail.xml
+%{__install} -pm 644 package.xml %{buildroot}%{pear_xmldir}/Mail.xml
 
 %check
 # Sanity check
@@ -94,7 +82,7 @@
 fi
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{pear_phpdir}/Mail.php
 %{pear_phpdir}/Mail
 %{pear_testdir}/Mail
@@ -102,6 +90,9 @@
 %doc LICENSE
 
 %changelog
+* Mon Sep 04 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.10-7
+- new and simpler %%prep and %%install
+
 * Mon Aug 28 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.10-6
 - FE6 rebuild