update to 1.8.1
This commit is contained in:
Remi Collet
parent
5bc3a2e8de
commit
3c2619daa5
@ -1,5 +1,6 @@
|
||||
PEAR-1.7.2.tgz
|
||||
Archive_Tar-1.3.2.tgz
|
||||
Archive_Tar-1.3.3.tgz
|
||||
Console_Getopt-1.2.3.tgz
|
||||
PEAR-1.8.1.tgz
|
||||
Structures_Graph-1.0.2.tgz
|
||||
XML_RPC-1.5.1.tgz
|
||||
XML_Util-1.2.1.tgz
|
||||
|
||||
@ -1,8 +1,13 @@
|
||||
<?php
|
||||
|
||||
/* $Id: install-pear.php,v 1.31 2008/03/11 22:04:32 timj Exp $ */
|
||||
/* $Id: install-pear.php,v 1.38 2009/04/20 04:32:22 cellog Exp $ */
|
||||
|
||||
error_reporting(1803);
|
||||
|
||||
if (ini_get('date.timezone') === '' && function_exists('date_default_timezone_set')) {
|
||||
date_default_timezone_set('UTC');
|
||||
}
|
||||
|
||||
error_reporting(E_ALL);
|
||||
$pear_dir = dirname(__FILE__);
|
||||
ini_set('include_path', '');
|
||||
if (function_exists('mb_internal_encoding')) {
|
||||
@ -38,8 +43,17 @@ for ($i = 0; $i < sizeof($argv); $i++) {
|
||||
if (ereg('package-(.*)\.xml$', $bn, $matches) ||
|
||||
ereg('([A-Za-z0-9_:]+)-.*\.(tar|tgz)$', $bn, $matches)) {
|
||||
$install_files[$matches[1]] = $arg;
|
||||
} elseif ($arg == '-a') {
|
||||
$cache_dir = $argv[$i+1];
|
||||
$i++;
|
||||
} elseif ($arg == '--force') {
|
||||
$force = true;
|
||||
} elseif ($arg == '-dp') {
|
||||
$prefix = $argv[$i+1];
|
||||
$i++;
|
||||
} elseif ($arg == '-ds') {
|
||||
$suffix = $argv[$i+1];
|
||||
$i++;
|
||||
} elseif ($arg == '-d') {
|
||||
$with_dir = $argv[$i+1];
|
||||
$i++;
|
||||
@ -47,11 +61,20 @@ for ($i = 0; $i < sizeof($argv); $i++) {
|
||||
$bin_dir = $argv[$i+1];
|
||||
$i++;
|
||||
} elseif ($arg == '-c') {
|
||||
$cfg_dir = $argv[$i+1];
|
||||
$i++;
|
||||
$cfg_dir = $argv[$i+1];
|
||||
$i++;
|
||||
} elseif ($arg == '-w') {
|
||||
$www_dir = $argv[$i+1];
|
||||
$i++;
|
||||
} elseif ($arg == '-p') {
|
||||
$php_bin = $argv[$i+1];
|
||||
$i++;
|
||||
} elseif ($arg == '-o') {
|
||||
$download_dir = $argv[$i+1];
|
||||
$i++;
|
||||
} elseif ($arg == '-t') {
|
||||
$temp_dir = $argv[$i+1];
|
||||
$i++;
|
||||
} elseif ($arg == '--debug') {
|
||||
$debug = 1;
|
||||
} elseif ($arg == '--extremedebug') {
|
||||
@ -83,11 +106,31 @@ if (!empty($bin_dir)) {
|
||||
$config->set('bin_dir', $bin_dir, 'default');
|
||||
}
|
||||
|
||||
// Cache files
|
||||
if (!empty($cache_dir)) {
|
||||
$config->set('cache_dir', $cache_dir, 'default');
|
||||
}
|
||||
|
||||
// Config files
|
||||
if (!empty($cfg_dir)) {
|
||||
$config->set('cfg_dir', $cfg_dir, 'default');
|
||||
}
|
||||
|
||||
// Web files
|
||||
if (!empty($www_dir)) {
|
||||
$config->set('www_dir', $www_dir, 'default');
|
||||
}
|
||||
|
||||
// Downloaded files
|
||||
if (!empty($download_dir)) {
|
||||
$config->set('download_dir', $download_dir, 'default');
|
||||
}
|
||||
|
||||
// Temporary files
|
||||
if (!empty($temp_dir)) {
|
||||
$config->set('temp_dir', $temp_dir, 'default');
|
||||
}
|
||||
|
||||
// User supplied a dir prefix
|
||||
if (!empty($with_dir)) {
|
||||
$ds = DIRECTORY_SEPARATOR;
|
||||
@ -95,6 +138,12 @@ if (!empty($with_dir)) {
|
||||
$config->set('doc_dir', $with_dir . $ds . 'doc', 'default');
|
||||
$config->set('data_dir', $with_dir . $ds . 'data', 'default');
|
||||
$config->set('test_dir', $with_dir . $ds . 'test', 'default');
|
||||
if (empty($www_dir)) {
|
||||
$config->set('www_dir', $with_dir . $ds . 'htdocs', 'default');
|
||||
}
|
||||
if (empty($cfg_dir)) {
|
||||
$config->set('cfg_dir', $with_dir . $ds . 'cfg', 'default');
|
||||
}
|
||||
if (!is_writable($config->get('cache_dir'))) {
|
||||
include_once 'System.php';
|
||||
$cdir = System::mktemp(array('-d', 'pear'));
|
||||
@ -106,9 +155,32 @@ if (!empty($with_dir)) {
|
||||
$config->set('cache_dir', $cdir);
|
||||
}
|
||||
}
|
||||
|
||||
// PHP executable
|
||||
if (!empty($php_bin)) {
|
||||
$config->set('php_bin', $php_bin);
|
||||
}
|
||||
|
||||
// PHP prefix
|
||||
if (isset($prefix)) {
|
||||
if ($prefix != 'a') {
|
||||
if ($prefix[0] == 'a') {
|
||||
$prefix = substr($prefix, 1);
|
||||
}
|
||||
$config->set('php_prefix', $prefix, 'system');
|
||||
}
|
||||
}
|
||||
|
||||
// PHP suffix
|
||||
if (isset($suffix)) {
|
||||
if ($suffix != 'a') {
|
||||
if ($suffix[0] == 'a') {
|
||||
$suffix = substr($suffix, 1);
|
||||
}
|
||||
$config->set('php_suffix', $suffix, 'system');
|
||||
}
|
||||
}
|
||||
|
||||
/* Print PEAR Conf (useful for debuging do NOT REMOVE) */
|
||||
if ($debug) {
|
||||
sort($keys);
|
||||
|
||||
@ -1,21 +1,22 @@
|
||||
|
||||
%define peardir %{_datadir}/pear
|
||||
%global peardir %{_datadir}/pear
|
||||
|
||||
%define xmlrpcver 1.5.1
|
||||
%define getoptver 1.2.3
|
||||
%define arctarver 1.3.2
|
||||
%define structver 1.0.2
|
||||
%global xmlrpcver 1.5.1
|
||||
%global getoptver 1.2.3
|
||||
%global arctarver 1.3.3
|
||||
%global structver 1.0.2
|
||||
%global xmlutil 1.2.1
|
||||
|
||||
Summary: PHP Extension and Application Repository framework
|
||||
Name: php-pear
|
||||
Version: 1.7.2
|
||||
Release: 3%{?dist}
|
||||
Version: 1.8.1
|
||||
Release: 1%{?dist}
|
||||
Epoch: 1
|
||||
License: PHP
|
||||
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.31 -O install-pear.php
|
||||
# wget http://cvs.php.net/viewvc.cgi/pear-core/install-pear.php?revision=1.39 -O install-pear.php
|
||||
Source1: install-pear.php
|
||||
Source2: relocate.php
|
||||
Source3: strip.php
|
||||
@ -28,6 +29,7 @@ Source20: http://pear.php.net/get/XML_RPC-%{xmlrpcver}.tgz
|
||||
Source21: http://pear.php.net/get/Archive_Tar-%{arctarver}.tgz
|
||||
Source22: http://pear.php.net/get/Console_Getopt-%{getoptver}.tgz
|
||||
Source23: http://pear.php.net/get/Structures_Graph-%{structver}.tgz
|
||||
Source24: http://pear.php.net/get/XML_Util-%{xmlutil}.tgz
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
@ -37,6 +39,9 @@ Provides: php-pear(Archive_Tar) = %{arctarver}
|
||||
Provides: php-pear(PEAR) = %{version}
|
||||
Provides: php-pear(Structures_Graph) = %{structver}
|
||||
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
|
||||
|
||||
%description
|
||||
@ -47,10 +52,12 @@ components. This package contains the basic PEAR components.
|
||||
%setup -cT
|
||||
|
||||
# Create a usable PEAR directory (used by install-pear.php)
|
||||
for archive in %{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23}
|
||||
for archive in %{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24}
|
||||
do
|
||||
tar xzf $archive --strip-components 1 || tar xzf $archive --strip-path 1
|
||||
done
|
||||
tar xzf %{SOURCE24} package.xml
|
||||
mv package.xml XML_Util.xml
|
||||
|
||||
# apply patches on used PEAR during install
|
||||
# -- no patch
|
||||
@ -74,6 +81,7 @@ export PHP_PEAR_TEMP_DIR=/var/tmp
|
||||
|
||||
install -d $RPM_BUILD_ROOT%{peardir} \
|
||||
$RPM_BUILD_ROOT%{_localstatedir}/cache/php-pear \
|
||||
$RPM_BUILD_ROOT%{_localstatedir}/www/html \
|
||||
$RPM_BUILD_ROOT%{peardir}/.pkgxml \
|
||||
$RPM_BUILD_ROOT%{_sysconfdir}/rpm \
|
||||
$RPM_BUILD_ROOT%{_sysconfdir}/pear
|
||||
@ -85,7 +93,8 @@ export INSTALL_ROOT=$RPM_BUILD_ROOT
|
||||
%{SOURCE1} -d %{peardir} \
|
||||
-c %{_sysconfdir}/pear \
|
||||
-b %{_bindir} \
|
||||
%{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE20}
|
||||
-w %{_localstatedir}/www/html \
|
||||
%{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE20}
|
||||
|
||||
# Replace /usr/bin/* with simple scripts:
|
||||
install -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/pear
|
||||
@ -106,12 +115,17 @@ install -m 644 -c %{SOURCE13} \
|
||||
$RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.pear
|
||||
|
||||
# apply patches on installed PEAR tree
|
||||
cd $RPM_BUILD_ROOT%{peardir}
|
||||
pushd $RPM_BUILD_ROOT%{peardir}
|
||||
# -- no patch
|
||||
popd
|
||||
|
||||
# Why this file here ?
|
||||
rm -rf $RPM_BUILD_ROOT/.depdb* $RPM_BUILD_ROOT/.lock $RPM_BUILD_ROOT/.channels $RPM_BUILD_ROOT/.filemap
|
||||
|
||||
# Need for re-registrying XML_Util
|
||||
install -m 644 XML_Util.xml $RPM_BUILD_ROOT%{peardir}/.pkgxml/
|
||||
|
||||
|
||||
%check
|
||||
# Check that no bogus paths are left in the configuration, or in
|
||||
# the generated registry files.
|
||||
@ -121,10 +135,17 @@ grep '"/tmp"' $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1
|
||||
grep /usr/local $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1
|
||||
grep -rl $RPM_BUILD_ROOT $RPM_BUILD_ROOT && exit 1
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
rm new-pear.conf
|
||||
|
||||
|
||||
%triggerpostun -- php-pear-XML-Util
|
||||
# re-register extension unregistered during postun of obsoleted php-pear-XML-Util
|
||||
%{_bindir}/pear install --nodeps --soft --force --register-only %{pear_xmldir}/XML_Util.xml >/dev/null || :
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{peardir}
|
||||
@ -132,10 +153,17 @@ rm new-pear.conf
|
||||
%config(noreplace) %{_sysconfdir}/pear.conf
|
||||
%config %{_sysconfdir}/rpm/macros.pear
|
||||
%dir %{_localstatedir}/cache/php-pear
|
||||
%dir %{_localstatedir}/www/html
|
||||
%dir %{_sysconfdir}/pear
|
||||
%doc LICENSE README
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat May 30 2009 Remi Collet <Fedora@FamilleCollet.com> 1:1.8.1-1
|
||||
- update to 1.8.1
|
||||
- Update install-pear.php script (1.39)
|
||||
- add XML_Util
|
||||
|
||||
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.7.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
@ -147,7 +175,7 @@ rm new-pear.conf
|
||||
- Update install-pear.php script (1.32)
|
||||
|
||||
* Tue Mar 11 2008 Tim Jackson <rpm@timj.co.uk> 1:1.7.1-2
|
||||
- Set cfg_dir to be %{_sysconfdir}/pear (and own it)
|
||||
- Set cfg_dir to be %%{_sysconfdir}/pear (and own it)
|
||||
- Update install-pear.php script
|
||||
- Add %%pear_cfgdir and %%pear_wwwdir macros
|
||||
|
||||
|
||||
5
sources
5
sources
@ -1,5 +1,6 @@
|
||||
6614c4862f16c80eadb2d00b776d33c0 PEAR-1.7.2.tgz
|
||||
17d49e837b64df4e8f9124f829b22cd1 Archive_Tar-1.3.2.tgz
|
||||
38d443cba3f2dc378fdadb73075dcad9 Archive_Tar-1.3.3.tgz
|
||||
d7618327f9302a7191893768982de823 Console_Getopt-1.2.3.tgz
|
||||
03f7d3b1aececfd45302c9235103299c PEAR-1.8.1.tgz
|
||||
2664e2d024048f982e12fad4d1bfbb87 Structures_Graph-1.0.2.tgz
|
||||
1b516162ad65971b5fd04a7c279627ec XML_RPC-1.5.1.tgz
|
||||
b8d4efcdb11b308b179f7bb63043284f XML_Util-1.2.1.tgz
|
||||
|
||||
Loading…
Reference in New Issue
Block a user