rpms/php-pear-HTTP/devel php-pear-HTTP.spec,1.1,1.2

Sun Jul 16 14:27:43 UTC 2006

Author: remi

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

Modified Files:
	php-pear-HTTP.spec 
Log Message:
Use new macros.pear



Index: php-pear-HTTP.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-HTTP/devel/php-pear-HTTP.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- php-pear-HTTP.spec	3 Jul 2006 20:52:08 -0000	1.1
+++ php-pear-HTTP.spec	16 Jul 2006 14:27:42 -0000	1.2
@@ -1,21 +1,29 @@
-%define peardir %(pear config-get php_dir 2> /dev/null || echo %{_datadir}/pear)
-%define xmldir 	%{peardir}/.pkgxml
-
-Summary: 	PEAR: Miscellaneous HTTP utilities
-Summary(fr): 	PEAR: Divers utilitaires HTTP
-Name: 		php-pear-HTTP
-Version: 	1.4.0
-Release: 	3%{?dist}
-License: 	PHP License
-Group: 		Development/Libraries
-Source: 	http://pear.php.net/get/HTTP-%{version}.tgz
+# 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:	4%{?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
-BuildRequires: 	php-pear(PEAR) >= 1.4.9
-Provides: 	php-pear(HTTP) = %{version}
-Requires: 	php-pear(PEAR) >= 1.4.9, php >= 4.0.6
-BuildArch: 	noarch
+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}
 
 %description
 The HTTP class is a class with static methods for doing 
@@ -24,63 +32,67 @@
  
 %description -l fr
 La classe HTTP contient des mÃ©thodes statiques pour
-faire diverses tÃ¢ches concernant HTTP, comme la mise
-en forme des date, la nÃ©gociation de la langue ou les
-redirection HTTP.
+rÃ©aliser diverses tÃ¢ches concernant HTTP, comme la mise
+en forme des dates, la nÃ©gociation de la langue ou les
+redirections HTTP.
 
 %prep
-%setup -c -T
+%setup -c -q -T
 # XXX Source files location is missing here in pear cmd
-pear -v -c pearrc \
-        -d php_dir=%{peardir} \
-        -d doc_dir=/docs \
-        -d bin_dir=%{_bindir} \
-        -d data_dir=%{peardir}/data \
-        -d test_dir=%{peardir}/test \
-        -d ext_dir=%{_libdir} \
-        -s
+%{__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
+
+%{__install} -m 644 -c %{SOURCE1} LICENSE
 
 %install
 rm -rf %{buildroot}
-pear -c pearrc install --nodeps --packagingroot %{buildroot} %{SOURCE0}
+%{__pear} -c pearrc install --nodeps --packagingroot %{buildroot} %{SOURCE0}
 
-rm %{buildroot}/%{peardir}/.filemap
-rm %{buildroot}/%{peardir}/.lock
-rm -rf %{buildroot}/%{peardir}/.registry
-rm -rf %{buildroot}/%{peardir}/.channels
-rm %{buildroot}/%{peardir}/.depdb
-rm %{buildroot}/%{peardir}/.depdblock
+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
 
-%{__mkdir_p} %{buildroot}%{xmldir}
+%{__mkdir_p} %{buildroot}%{pear_xmldir}
 tar -xzf %{SOURCE0} package.xml
-cp -p package.xml %{buildroot}%{xmldir}/HTTP.xml
-
-%{__install} -m 644 -c %{SOURCE1} LICENSE
+cp -p package.xml %{buildroot}%{pear_xmldir}/HTTP.xml
 
 %check
 # Sanity check
-lst=$(find %{buildroot}%{peardir} -exec grep -q %{buildroot} {} \; -print)
+lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
 [ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
 
 %clean
 rm -rf %{buildroot}
 
 %post
-pear install --nodeps --soft --force --register-only %{xmldir}/HTTP.xml  >/dev/null || :
+%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/HTTP.xml  >/dev/null || :
 
 %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)
-%{peardir}/HTTP.php
-%{xmldir}/HTTP.xml
+%{pear_phpdir}/HTTP.php
+%{pear_xmldir}/HTTP.xml
 %doc LICENSE
 
 %changelog
+* Sat May 20 2006 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-4.fc5
+- install Licence in prep
+- use new macros from /etc/rpm/macros.pear
+
 * Sat May 20 2006 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-3.fc5
 - Require pear >= 1.4.9
 - bundle the v3.01 PHP LICENSE file
@@ -88,14 +100,14 @@
 - check from install to check (as in php-pear)
 
 * Sat May 06 2006 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-2.fc5
-- use %{_datadir}/pear/.pkgxml for XML (Bug #190252)
+- use %%{_datadir}/pear/.pkgxml for XML (Bug #190252)
 
 * Fri Apr 28 2006 Remi Collet <Fedora at FamilleCollet.com> 1.4.0-1.fc5
 - spec for extras
 - add french summary & description
 
 * Thu Apr 06 2006 Remi Collet <rpms at FamilleCollet.com> 1.4.0-2.fc{3,4,5}.remi
-- change /var/lib/pear to %{_libdir}/php/pear for XML (as in extras for FC5)
+- change /var/lib/pear to %%{_libdir}/php/pear for XML (as in extras for FC5)
 - spec cleanning
 
 * Sat Jan  7 2006 Remi Collet <remi.collet at univ-reims.fr> 1.4.0-1.fc{3,4}.remi


