diff --git a/install-pear.php b/install-pear.php index e91406b..271b9f2 100644 --- a/install-pear.php +++ b/install-pear.php @@ -1,6 +1,6 @@ set('php_dir', $with_dir, 'default'); $config->set('doc_dir', $with_dir . $ds . 'doc', 'default'); $config->set('data_dir', $with_dir . $ds . 'data', 'default'); - $config->set('www_dir', $with_dir . $ds . 'htdocs', 'default'); $config->set('test_dir', $with_dir . $ds . 'test', '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')); diff --git a/php-pear.spec b/php-pear.spec index 5cd6406..db7a2c4 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -9,13 +9,13 @@ Summary: PHP Extension and Application Repository framework Name: php-pear Version: 1.7.2 -Release: 1%{?dist} +Release: 2%{?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.32 -O install-pear.php +# wget http://cvs.php.net/viewvc.cgi/pear-core/install-pear.php?revision=1.31 -O install-pear.php Source1: install-pear.php Source2: relocate.php Source3: strip.php @@ -136,6 +136,9 @@ rm new-pear.conf %doc LICENSE README %changelog +* Sun May 18 2008 Remi Collet 1:1.7.2-2 +- revert to install-pear.php script 1.31 (for cfg_dir) + * Sun May 18 2008 Remi Collet 1:1.7.2-1 - update to 1.7.2 - Update install-pear.php script (1.32)