update Console_Getopt to 1.3.0, don't require php-devel (#657812)

This commit is contained in:
remi 2010-12-12 09:40:58 +01:00
parent bee08edc63
commit e598df7b10
4 changed files with 309 additions and 301 deletions

1
.gitignore vendored
View File

@ -10,3 +10,4 @@ XML_Util-1.2.1.tgz
/Structures_Graph-1.0.4.tgz
/XML_RPC-1.5.4.tgz
/XML_Util-1.2.1.tgz
/Console_Getopt-1.3.0.tgz

View File

@ -1,6 +1,6 @@
<?php
/* $Id: install-pear.php,v 1.38 2009/04/20 04:32:22 cellog Exp $ */
/* $Id$ */
error_reporting(1803);
@ -40,8 +40,8 @@ $debug = false;
for ($i = 0; $i < sizeof($argv); $i++) {
$arg = $argv[$i];
$bn = basename($arg);
if (ereg('package-(.*)\.xml$', $bn, $matches) ||
ereg('([A-Za-z0-9_:]+)-.*\.(tar|tgz)$', $bn, $matches)) {
if (preg_match('/package-(.*)\.xml$/', $bn, $matches) ||
preg_match('/([A-Za-z0-9_:]+)-.*\.(tar|tgz)$/', $bn, $matches)) {
$install_files[$matches[1]] = $arg;
} elseif ($arg == '-a') {
$cache_dir = $argv[$i+1];

View File

@ -1,7 +1,7 @@
%global peardir %{_datadir}/pear
%global xmlrpcver 1.5.4
%global getoptver 1.2.3
%global getoptver 1.3.0
%global arctarver 1.3.7
%global structver 1.0.4
%global xmlutil 1.2.1
@ -9,7 +9,7 @@
Summary: PHP Extension and Application Repository framework
Name: php-pear
Version: 1.9.1
Release: 5%{?dist}
Release: 6%{?dist}
Epoch: 1
# PEAR, Archive_Tar, XML_Util are BSD
# XML-RPC, Console_Getopt are PHP
@ -18,7 +18,7 @@ License: BSD and PHP and LGPLv2+
Group: Development/Languages
URL: http://pear.php.net/package/PEAR
Source0: http://download.pear.php.net/package/PEAR-%{version}.tgz
# wget http://cvs.php.net/viewvc.cgi/pear-core/install-pear.php?revision=1.39 -O install-pear.php
# wget http://svn.php.net/viewvc/pear/pear-core/trunk/install-pear.php?revision=287906&view=co -O install-pear.php
Source1: install-pear.php
Source2: relocate.php
Source3: strip.php
@ -36,6 +36,7 @@ Source24: http://pear.php.net/get/XML_Util-%{xmlutil}.tgz
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: php-cli >= 5.1.0-1, php-xml, gnupg
Provides: php-pear(Console_Getopt) = %{getoptver}
Provides: php-pear(Archive_Tar) = %{arctarver}
Provides: php-pear(PEAR) = %{version}
@ -44,7 +45,8 @@ Provides: php-pear(XML_RPC) = %{xmlrpcver}
Provides: php-pear(XML_Util) = %{xmlutil}
Obsoletes: php-pear-XML-Util <= %{xmlutil}
Provides: php-pear-XML-Util = %{xmlutil}-%{release}
Requires: php-cli >= 5.1.0-1, php-devel
Requires: php-cli >= 5.1.0-1
%description
PEAR is a framework and distribution system for reusable PHP
@ -164,6 +166,11 @@ rm new-pear.conf
%changelog
* Sun Dec 12 2010 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.1-6
- update Console_Getopt to 1.3.0
- don't require php-devel (#657812)
- update install-pear.php
* Tue Oct 26 2010 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.1-5
- update Structures_Graph to 1.0.4

View File

@ -1,5 +1,5 @@
a40b15b38ef8a5239309c9faedfa123b Archive_Tar-1.3.7.tgz
d7618327f9302a7191893768982de823 Console_Getopt-1.2.3.tgz
d8e9e8e5efc5a4afdc7e62b294b2655e Console_Getopt-1.3.0.tgz
e301d2d81371327a96864a307b85509d PEAR-1.9.1.tgz
b99c5e9ac348a2e81515ba16deb7ded3 Structures_Graph-1.0.4.tgz
da0d1c21960a67bc76629db28d2c7755 XML_RPC-1.5.4.tgz