diff options
| -rw-r--r-- | install-pear.php | 9 | ||||
| -rw-r--r-- | macros.pear | 2 | ||||
| -rw-r--r-- | pecl.sh | 2 | ||||
| -rw-r--r-- | php-pear.spec | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/install-pear.php b/install-pear.php index c06dc04..facb6ee 100644 --- a/install-pear.php +++ b/install-pear.php @@ -72,6 +72,9 @@ for ($i = 0; $i < sizeof($argv); $i++) { } elseif ($arg == '-o' || $arg == '--download') { $download_dir = $argv[$i+1]; $i++; + } elseif ($arg == '-m' || $arg == '--metadata') { + $metadata_dir = $argv[$i+1]; + $i++; } elseif ($arg == '-t' || $arg == '--temp') { $temp_dir = $argv[$i+1]; $i++; @@ -159,6 +162,10 @@ if (!empty($test_dir)) { if (!empty($with_dir)) { $ds = DIRECTORY_SEPARATOR; $config->set('php_dir', $with_dir, 'default'); + // Metadata + if (!empty($metadata_dir)) { + $config->set('metadata_dir', $metadata_dir, 'default'); + } if (empty($doc_dir)) { $config->set('doc_dir', $with_dir . $ds . 'doc', 'default'); } @@ -230,7 +237,7 @@ $options['upgrade'] = true; $install_root = getenv('INSTALL_ROOT'); if (!empty($install_root)) { $options['packagingroot'] = $install_root; - $reg = &new PEAR_Registry($options['packagingroot']); + $reg = &new PEAR_Registry($options['packagingroot'], false, false, $metadata_dir); } else { $reg = $config->getRegistry('default'); } diff --git a/macros.pear b/macros.pear index a07a5cc..5862d80 100644 --- a/macros.pear +++ b/macros.pear @@ -13,7 +13,7 @@ %pear_datadir %(%{__pear} config-get data_dir 2> /dev/null || echo undefined) %pear_cfgdir %(%{__pear} config-get cfg_dir 2> /dev/null || echo undefined) %pear_wwwdir %(%{__pear} config-get www_dir 2> /dev/null || echo undefined) -%pear_metadir %{pear_phpdir} +%pear_metadir %(%{__pear} config-get metadata_dir 2> /dev/null || echo undefined) # # Define PECL directories used in php-pecl-* spec files: @@ -1,5 +1,5 @@ #!/bin/sh -exec /usr/bin/php -C -n -q \ +exec /usr/bin/php -C -q \ -d include_path=/usr/share/pear \ -d date.timezone=UTC \ -d output_buffering=1 \ diff --git a/php-pear.spec b/php-pear.spec index c069a64..68b720b 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -15,7 +15,7 @@ Summary: PHP Extension and Application Repository framework Name: php-pear Version: 1.9.4 -Release: 16%{?dist} +Release: 16%{?dist}.1 Epoch: 1 # PEAR, Archive_Tar, XML_Util are BSD # Console_Getopt is PHP |