SOURCES: php-pear-PEAR-FHS.patch - lock and filemap not moved to /...

[glen]

Author: glen                         Date: Tue Mar  7 18:20:42 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- lock and filemap not moved to /var until install is fixed

---- Files affected:
SOURCES:
   php-pear-PEAR-FHS.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/php-pear-PEAR-FHS.patch
diff -u SOURCES/php-pear-PEAR-FHS.patch:1.1 SOURCES/php-pear-PEAR-FHS.patch:1.2
--- SOURCES/php-pear-PEAR-FHS.patch:1.1	Fri Mar  3 22:37:25 2006
+++ SOURCES/php-pear-PEAR-FHS.patch	Tue Mar  7 19:20:37 2006
@@ -1,19 +1,13 @@
 --- /usr/share/pear/PEAR/Registry.php~	2006-03-02 01:40:24.000000000 +0200
 +++ /usr/share/pear/PEAR/Registry.php	2006-03-02 01:46:34.000000000 +0200
-@@ -141,12 +141,11 @@
-                            $pecl_channel = false)
-     {
+@@ -143,8 +143,8 @@
          parent::PEAR();
--        $ds = DIRECTORY_SEPARATOR;
+         $ds = DIRECTORY_SEPARATOR;
          $this->install_dir = $pear_install_dir;
 -        $this->channelsdir = $pear_install_dir.$ds.'.channels';
 -        $this->statedir = $pear_install_dir.$ds.'.registry';
--        $this->filemap  = $pear_install_dir.$ds.'.filemap';
--        $this->lockfile = $pear_install_dir.$ds.'.lock';
 +        $this->channelsdir = '/var/lib/pear/channels';
 +        $this->statedir = '/var/lib/pear/registry';
-+        $this->filemap  = '/var/lib/pear/.filemap';
-+        $this->lockfile = '/var/lib/pear/.lock';
+         $this->filemap  = $pear_install_dir.$ds.'.filemap';
+         $this->lockfile = $pear_install_dir.$ds.'.lock';
          $this->_pearChannel = $pear_channel;
-         $this->_peclChannel = $pecl_channel;
-         $this->_config = false;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/php-pear-PEAR-FHS.patch?r1=1.1&r2=1.2&f=u