Author: glen Date: Sun Aug 22 10:04:03 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- add Net/UserAgent dir
- use __pear macro to add channels
- rel 4
---- Files affected:
packages/php-pear:
php-pear.spec (1.55 -> 1.56)
---- Diffs:
================================================================
Index: packages/php-pear/php-pear.spec
diff -u packages/php-pear/php-pear.spec:1.55
packages/php-pear/php-pear.spec:1.56
--- packages/php-pear/php-pear.spec:1.55 Tue Jul 20 09:25:27 2010
+++ packages/php-pear/php-pear.spec Sun Aug 22 12:03:58 2010
@@ -3,7 +3,7 @@
Summary(pl.UTF-8): PEAR - rozszerzenie PHP i repozytorium aplikacji
Name: php-pear
Version: 1.3
-Release: 3
+Release: 4
Epoch: 4
License: Public Domain
Group: Development/Languages/PHP
@@ -15,6 +15,7 @@
Source10: php-channel-prov.php
BuildRequires: /usr/bin/php
BuildRequires: php-pear-PEAR >= 1:1.9.0
+BuildRequires: rpmbuild(macros) >= 1.570
Obsoletes: php-pear-additional_classes
Obsoletes: php4-pear
Conflicts: php-pear-PEAR < 1:1.7.2-10
@@ -53,21 +54,19 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{php_pear_dir}/{bin,data,tests}
+install -d $RPM_BUILD_ROOT%{php_pear_dir}/{.registry,bin,data,tests}
# add extra channels
-pear -c pearrc config-set php_dir $RPM_BUILD_ROOT%{php_pear_dir}
-pear -c pearrc channel-add %{SOURCE0}
-pear -c pearrc channel-add %{SOURCE1}
-pear -c pearrc channel-add %{SOURCE2}
-pear -c pearrc channel-add %{SOURCE3}
-pear -c pearrc channel-add %{SOURCE4}
+%{__pear} -c pearrc config-set php_dir $RPM_BUILD_ROOT%{php_pear_dir}
+%{__pear} -c pearrc channel-add %{SOURCE0}
+%{__pear} -c pearrc channel-add %{SOURCE1}
+%{__pear} -c pearrc channel-add %{SOURCE2}
+%{__pear} -c pearrc channel-add %{SOURCE3}
+%{__pear} -c pearrc channel-add %{SOURCE4}
while read dir; do
install -d $RPM_BUILD_ROOT$dir
done <<EOF
-%{php_pear_dir}/.registry
-%{php_pear_dir}/bin
%{php_pear_dir}/Archive
%{php_pear_dir}/Auth
%{php_pear_dir}/Cache
@@ -92,6 +91,7 @@
%{php_pear_dir}/MP3
%{php_pear_dir}/Math
%{php_pear_dir}/Net
+%{php_pear_dir}/Net/UserAgent
%{php_pear_dir}/Numbers
%{php_pear_dir}/PHP
%{php_pear_dir}/Payment
@@ -184,6 +184,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.56 2010/08/22 10:03:58 glen
+- add Net/UserAgent dir
+- use __pear macro to add channels
+- rel 4
+
Revision 1.55 2010/07/20 07:25:27 glen
- BR PEAR 1.9.0
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pear/php-pear.spec?r1=1.55&r2=1.56&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit