rpms/php-pear/devel install-pear.php, 1.3, 1.4 php-pear.spec, 1.33, 1.34

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/php-pear/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22229

Modified Files:
	install-pear.php php-pear.spec 
Log Message:
revert to  install-pear.php script 1.31 


Index: install-pear.php
===================================================================
RCS file: /cvs/extras/rpms/php-pear/devel/install-pear.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- install-pear.php	18 May 2008 06:16:04 -0000	1.3
+++ install-pear.php	18 May 2008 06:45:15 -0000	1.4
@@ -94,11 +94,7 @@
     $config->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'));


Index: php-pear.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear/devel/php-pear.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- php-pear.spec	18 May 2008 06:16:04 -0000	1.33
+++ php-pear.spec	18 May 2008 06:45:15 -0000	1.34
@@ -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 @@
 %doc LICENSE README
 
 %changelog
+* Sun May 18 2008 Remi Collet <Fedora at FamilleCollet.com> 1:1.7.2-2
+- revert to install-pear.php script 1.31 (for cfg_dir)
+
 * Sun May 18 2008 Remi Collet <Fedora at FamilleCollet.com> 1:1.7.2-1
 - update to 1.7.2
 - Update install-pear.php script (1.32)