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

[Remi Collet]

commit 735a4cc573352732b37df68b7dbf600aa3903894
Author: remi <fedora at famillecollet.com>
Date:   Thu Mar 24 18:55:29 2011 +0100

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

 .gitignore       |    1 +
 install-pear.php |   14 ++++++++++++--
 php-pear.spec    |   15 ++++++++++++---
 sources          |    2 +-
 4 files changed, 26 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a4ccf1a..2b214cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ XML_Util-1.2.1.tgz
 /XML_Util-1.2.1.tgz
 /Console_Getopt-1.3.0.tgz
 /PEAR-1.9.2.tgz
+/Console_Getopt-1.3.1.tgz
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 b5a0241..3db5fcc 100644
--- a/php-pear.spec
+++ b/php-pear.spec
@@ -1,7 +1,7 @@
 %global peardir %{_datadir}/pear
 
 %global xmlrpcver 1.5.4
-%global getoptver 1.3.0
+%global getoptver 1.3.1
 %global arctarver 1.3.7
 %global structver 1.0.4
 %global xmlutil   1.2.1
@@ -9,7 +9,7 @@
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
 Version: 1.9.2
-Release: 1%{?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,16 @@ 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
+- update Console_Getopt to 1.3.1 (no change)
+
 * Mon Feb 28 2011 Remi Collet <Fedora at FamilleCollet.com> 1:1.9.2-1
 - update to 1.9.2 (bug + security fix)
   http://pear.php.net/advisory-20110228.txt
diff --git a/sources b/sources
index 6a91dd6..0760657 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 a40b15b38ef8a5239309c9faedfa123b  Archive_Tar-1.3.7.tgz
-d8e9e8e5efc5a4afdc7e62b294b2655e  Console_Getopt-1.3.0.tgz
+310b39cf091b9a0abf398bead60f3f8d  Console_Getopt-1.3.1.tgz
 2810094b44cf1e9e7da5b5bc3e7b1798  PEAR-1.9.2.tgz
 b99c5e9ac348a2e81515ba16deb7ded3  Structures_Graph-1.0.4.tgz
 da0d1c21960a67bc76629db28d2c7755  XML_RPC-1.5.4.tgz