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

[Remi Collet (remi)]

Author: remi

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

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



Index: php-pear-HTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP/devel/php-pear-HTTP.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-HTTP.spec	28 Aug 2006 14:36:34 -0000	1.3
+++ php-pear-HTTP.spec	4 Sep 2006 15:58:45 -0000	1.4
@@ -1,29 +1,29 @@
 # default values when new /etc/rpm/macros.pear not present
-%{!?__pear:		%define __pear		%{_bindir}/pear}
-%{!?pear_phpdir:	%define pear_phpdir	%(%{__pear} config-get php_dir  2> /dev/null || echo undefined)}
-%{!?pear_docdir:	%define pear_docdir	%(%{__pear} config-get doc_dir  2> /dev/null || echo undefined)}
-%{!?pear_testdir:	%define pear_testdir	%(%{__pear} config-get test_dir 2> /dev/null || echo undefined)}
-%{!?pear_datadir:	%define pear_datadir	%(%{__pear} config-get data_dir 2> /dev/null || echo undefined)}
-%{!?pear_xmldir:	%define pear_xmldir	%{pear_phpdir}/.pkgxml}
-
-Summary:	PEAR: Miscellaneous HTTP utilities
-Summary(fr):	PEAR: Divers utilitaires HTTP
-Name:		php-pear-HTTP
-Version:	1.4.0
-Release:	5%{?dist}
-License:	PHP License
-Group:		Development/Libraries
-Source:		http://pear.php.net/get/HTTP-%{version}.tgz
-Source1:	PHP-LICENSE-3.01
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL:		http://pear.php.net/package/HTTP
-
-BuildArch:	  noarch
-BuildRequires:	  php-pear(PEAR) >= 1.4.9
-Requires(post):	  %{__pear}
+%{!?__pear:       %define __pear       %{_bindir}/pear}
+%{!?pear_phpdir:  %define pear_phpdir  %(%{__pear} config-get php_dir  2> /dev/null || echo undefined)}
+%{!?pear_docdir:  %define pear_docdir  %(%{__pear} config-get doc_dir  2> /dev/null || echo undefined)}
+%{!?pear_testdir: %define pear_testdir %(%{__pear} config-get test_dir 2> /dev/null || echo undefined)}
+%{!?pear_datadir: %define pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined)}
+%{!?pear_xmldir:  %define pear_xmldir  %{pear_phpdir}/.pkgxml}
+
+Summary:     PEAR: Miscellaneous HTTP utilities
+Summary(fr): PEAR: Divers utilitaires HTTP
+Name:        php-pear-HTTP
+Version:     1.4.0
+Release:     6%{?dist}
+License:     PHP License
+Group:       Development/Libraries
+Source:      http://pear.php.net/get/HTTP-%{version}.tgz
+Source1:     PHP-LICENSE-3.01
+BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:         http://pear.php.net/package/HTTP
+
+BuildArch:        noarch
+BuildRequires:    php-pear(PEAR) >= 1.4.9
+Requires(post):   %{__pear}
 Requires(postun): %{__pear}
-Requires:	  php-pear(PEAR) >= 1.4.9, php >= 4.0.6
-Provides:	  php-pear(HTTP) = %{version}
+Requires:         php-pear(PEAR) >= 1.4.9, php >= 4.0.6
+Provides:         php-pear(HTTP) = %{version}
 
 %description
 The HTTP class is a class with static methods for doing 
@@ -37,33 +37,21 @@
 redirections HTTP.
 
 %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 HTTP-%{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}/HTTP.xml
+%{__install} -pm 644 package.xml %{buildroot}%{pear_xmldir}/HTTP.xml
 
 %check
 # Sanity check
@@ -79,16 +67,19 @@
 %postun
 # if refcount = 0 then package has been removed (not upgraded)
 if [ "$1" -eq "0" ]; then
-	%{__pear} uninstall --nodeps --ignore-errors --register-only HTTP  >/dev/null || :
+    %{__pear} uninstall --nodeps --ignore-errors --register-only HTTP  >/dev/null || :
 fi
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{pear_phpdir}/HTTP.php
 %{pear_xmldir}/HTTP.xml
 %doc LICENSE
 
 %changelog
+* Mon Sep 04 2006 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-6
+- new and simpler %%prep and %%install
+
 * Mon Aug 28 2006 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-5
 - FE6 rebuild