[php-pear] move %%{pear_docdir} to %%{_docdir}/pear

[Remi Collet]

commit 65cf09fc46fa4e1d0864fbbbafc5034fa2e4e1bf
Author: remi <fedora at famillecollet.com>
Date:   Thu Mar 24 18:33:18 2011 +0100

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

 install-pear.php |   14 ++++++++++++--
 php-pear.spec    |   12 ++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/install-pear.php b/install-pear.php
index 1be987e..a8ca995 100644
--- a/install-pear.php
+++ b/install-pear.php
@@ -1,5 +1,5 @@
 <?php
-
+while (@ob_end_flush());
 /* $Id$ */
 
 error_reporting(1803);
@@ -75,6 +75,9 @@ for ($i = 0; $i < sizeof($argv); $i++) {
     } elseif ($arg == '-t') {
         $temp_dir = $argv[$i+1];
         $i++;
+    } elseif ($arg == '-D') {
+        $doc_dir = $argv[$i+1];
+        $i++;
     } elseif ($arg == '--debug') {
         $debug = 1;
     } elseif ($arg == '--extremedebug') {
@@ -131,11 +134,18 @@ if (!empty($temp_dir)) {
     $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
 if (!empty($with_dir)) {
     $ds = DIRECTORY_SEPARATOR;
     $config->set('php_dir', $with_dir, 'default');
-    $config->set('doc_dir', $with_dir . $ds . 'doc', 'default');
+    if (empty($doc_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)) {
diff --git a/php-pear.spec b/php-pear.spec
index 050af25..619659b 100644
--- a/php-pear.spec
+++ b/php-pear.spec
@@ -9,7 +9,7 @@
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
 Version: 1.9.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 # PEAR, Archive_Tar, XML_Util are BSD
 # XML-RPC, Console_Getopt are PHP
@@ -18,7 +18,8 @@ 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://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
 Source2: relocate.php
 Source3: strip.php
@@ -101,6 +102,7 @@ export INSTALL_ROOT=$RPM_BUILD_ROOT
                  -c %{_sysconfdir}/pear \
                  -b %{_bindir} \
                  -w %{_localstatedir}/www/html \
+                 -D %{_docdir}/pear \
                  %{SOURCE0} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE20}
 
 # Replace /usr/bin/* with simple scripts:
@@ -163,9 +165,15 @@ rm new-pear.conf
 %dir %{_localstatedir}/www/html
 %dir %{_sysconfdir}/pear
 %doc README* LICENSE*
+%dir %{_docdir}/pear
+%doc %{_docdir}/pear/*
 
 
 %changelog
+* Wed Mar 16 2011 Remi Collet <Fedora at 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 at FamilleCollet.com> 1:1.9.2-2
 - update Console_Getopt to 1.3.1 (no change)