rpms/php-pear
6
0
Fork 0
Code Issues Pull Requests Releases Activity

move %%{pear_docdir} to %%{_docdir}/pear

Browse Source
This commit is contained in:
remi 2011-03-24 18:33:18 +01:00
parent 4939e1c751
commit 65cf09fc46
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
install-pear.php
View File

@ -1,5 +1,5 @@
<?php <?php
while (@ob_end_flush());
/* $Id$ */ /* $Id$ */
error_reporting(1803); error_reporting(1803);
@ -75,6 +75,9 @@ for ($i = 0; $i < sizeof($argv); $i++) {
} elseif ($arg == '-t') { } elseif ($arg == '-t') {
$temp_dir = $argv[$i+1]; $temp_dir = $argv[$i+1];
$i++; $i++;
} elseif ($arg == '-D') {
$doc_dir = $argv[$i+1];
$i++;
} elseif ($arg == '--debug') { } elseif ($arg == '--debug') {
$debug = 1; $debug = 1;
} elseif ($arg == '--extremedebug') { } elseif ($arg == '--extremedebug') {
@ -131,11 +134,18 @@ if (!empty($temp_dir)) {
$config->set('temp_dir', $temp_dir, 'default'); $config->set('temp_dir', $temp_dir, 'default');
} }
// Documentation files
if (!empty($doc_dir)) {
$config->set('doc_dir', $doc_dir, 'default');
}
// User supplied a dir prefix // User supplied a dir prefix
if (!empty($with_dir)) { if (!empty($with_dir)) {
$ds = DIRECTORY_SEPARATOR; $ds = DIRECTORY_SEPARATOR;
$config->set('php_dir', $with_dir, 'default'); $config->set('php_dir', $with_dir, 'default');
if (empty($doc_dir)) {
$config->set('doc_dir', $with_dir . $ds . 'doc', 'default'); $config->set('doc_dir', $with_dir . $ds . 'doc', 'default');
}
$config->set('data_dir', $with_dir . $ds . 'data', 'default'); $config->set('data_dir', $with_dir . $ds . 'data', 'default');
$config->set('test_dir', $with_dir . $ds . 'test', 'default'); $config->set('test_dir', $with_dir . $ds . 'test', 'default');
if (empty($www_dir)) { if (empty($www_dir)) {

12
php-pear.spec
View File

@ -9,7 +9,7 @@
Summary: PHP Extension and Application Repository framework Summary: PHP Extension and Application Repository framework
Name: php-pear Name: php-pear
Version: 1.9.2 Version: 1.9.2
Release: 2%{?dist} Release: 3%{?dist}
Epoch: 1 Epoch: 1
# PEAR, Archive_Tar, XML_Util are BSD # PEAR, Archive_Tar, XML_Util are BSD
# XML-RPC, Console_Getopt are PHP # XML-RPC, Console_Getopt are PHP
@ -18,7 +18,8 @@ License: BSD and PHP and LGPLv2+
Group: Development/Languages Group: Development/Languages
URL: http://pear.php.net/package/PEAR URL: http://pear.php.net/package/PEAR
Source0: http://download.pear.php.net/package/PEAR-%{version}.tgz Source0: http://download.pear.php.net/package/PEAR-%{version}.tgz
# wget http://svn.php.net/viewvc/pear/pear-core/trunk/install-pear.php?revision=287906&view=co -O install-pear.php # wget 'http://svn.php.net/viewvc/pear/pear-core/trunk/install-pear.php?revision=308763&view=co' -O install-pear.php
# see http://pear.php.net/bugs/18367 - doc_dir relocation
Source1: install-pear.php Source1: install-pear.php
Source2: relocate.php Source2: relocate.php
Source3: strip.php Source3: strip.php
@ -101,6 +102,7 @@ export INSTALL_ROOT=$RPM_BUILD_ROOT
-c %{_sysconfdir}/pear \ -c %{_sysconfdir}/pear \
-b %{_bindir} \ -b %{_bindir} \
-w %{_localstatedir}/www/html \ -w %{_localstatedir}/www/html \
-D %{_docdir}/pear \
%{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE20} %{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE20}
# Replace /usr/bin/* with simple scripts: # Replace /usr/bin/* with simple scripts:
@ -163,9 +165,15 @@ rm new-pear.conf
%dir %{_localstatedir}/www/html %dir %{_localstatedir}/www/html
%dir %{_sysconfdir}/pear %dir %{_sysconfdir}/pear
%doc README* LICENSE* %doc README* LICENSE*
%dir %{_docdir}/pear
%doc %{_docdir}/pear/*
%changelog %changelog
* Wed Mar 16 2011 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.2-3
- move %%{pear_docdir} to %%{_docdir}/pear
https://fedorahosted.org/fpc/ticket/69
* Tue Mar 8 2011 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.2-2 * Tue Mar 8 2011 Remi Collet <Fedora@FamilleCollet.com> 1:1.9.2-2
- update Console_Getopt to 1.3.1 (no change) - update Console_Getopt to 1.3.1 (no change)