- lock and filemap not moved to /var until install is fixed

Changed files:
    php-pear-PEAR-FHS.patch -> 1.2
    php-pear-PEAR.spec -> 1.113

diff --git a/php-pear-PEAR-FHS.patch b/php-pear-PEAR-FHS.patch
index 028219c11b4dcbf03dfb5caa8f183ee6759c8be3..f67d9e9dd5cb46b9c0e547cdaa4261ceac11d97c 100644 (file)
--- a/php-pear-PEAR-FHS.patch
+++ b/php-pear-PEAR-FHS.patch
@@ -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;

diff --git a/php-pear-PEAR.spec b/php-pear-PEAR.spec
index 086e3aaf80ff756a96f23df381f56ca23afd9499..766bf27aa4e19028680396b6e7d99898c9f0c108 100644 (file)
--- a/php-pear-PEAR.spec
+++ b/php-pear-PEAR.spec
@@ -7,7 +7,7 @@
 %define                _status         stable
 %define                _pearname       %{_class}
 #
-%define        _rel 0.8
+%define        _rel 0.14
 Summary:       PEAR Base System
 Summary(pl):   Podstawowy system PEAR
 Name:          php-pear-%{_pearname}
@@ -29,13 +29,11 @@ Patch4:             %{name}-specfile.patch
 Patch5:                %{name}-FHS.patch
 URL:           http://pear.php.net/package/PEAR
 BuildRequires: php-cli
-BuildRequires: php-pear >= 4:1.0-12.3
-BuildRequires: php-pear-PEAR
 %{!?with_bootstrap:BuildRequires:      rpm-php-pearprov >= 4.4.2-11}
 Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 Requires:      /usr/bin/php
 Requires:      php-pcre
-Requires:      php-pear >= 4:1.0-5.5
+Requires:      php-pear >= 4:1.0-12.3
 Requires:      php-pear-Archive_Tar >= 1.1
 Requires:      php-pear-Console_Getopt >= 1.2
 Requires:      php-pear-XML_RPC >= 1.4.0
@@ -157,8 +155,8 @@ install -d $RPM_BUILD_ROOT%{_statedir}/{registry/.channel.{__uri,pecl.php.net},c
 touch $RPM_BUILD_ROOT%{_statedir}/.depdb{,lock}
 touch $RPM_BUILD_ROOT%{_statedir}/channels/{__uri,{pear,pecl}.php.net}.reg
 touch $RPM_BUILD_ROOT%{_statedir}/channels/.alias/{pear,pecl}.txt
-touch $RPM_BUILD_ROOT%{_statedir}/.filemap
-touch $RPM_BUILD_ROOT%{_statedir}/.lock
+touch $RPM_BUILD_ROOT%{php_pear_dir}/.filemap
+touch $RPM_BUILD_ROOT%{php_pear_dir}/.lock
 
 # -C and -q options were for php-cgi, in php-cli they're enabled by default.
 %define php_exec exec /usr/bin/php -dinclude_path=%{php_pear_dir} -doutput_buffering=1
@@ -183,24 +181,23 @@ sed -e '/^\$''Log: /,$d' %{SOURCE2} > $RPM_BUILD_ROOT%{php_pear_dir}/data/%{_cla
 echo '$''Log: $' >> $RPM_BUILD_ROOT%{php_pear_dir}/data/%{_class}/template.spec
 
 %post
-if [ -f %{_docdir}/%{name}-%{version}/optional-packages.txt ]; then
-       cat %{_docdir}/%{name}-%{version}/optional-packages.txt
-fi
-if [ ! -f %{_statedir}/.lock ]; then
-       umask 2
-       touch %{_statedir}/.lock
-fi
 if [ ! -e %{php_pear_dir}/.registry ]; then
        ln -s %{_statedir}/registry %{php_pear_dir}/.registry
 fi
+if [ ! -f %{php_pear_dir}/.lock ]; then
+       %{_bindir}/pear list > /dev/null
+fi
+if [ -f %{_docdir}/%{name}-%{version}/optional-packages.txt ]; then
+       cat %{_docdir}/%{name}-%{version}/optional-packages.txt
+fi
 
 %triggerpostun -- %{name} < 1:1.4.7-0.3
 if [ ! -L %{php_pear_dir}/.registry ]; then
        mv -f %{php_pear_dir}/.registry/*.reg %{_statedir}/registry
+       rmdir %{php_pear_dir}/.registry/* 2>/dev/null
        rmdir %{php_pear_dir}/.registry 2>/dev/null || mv -v %{php_pear_dir}/.registry{,.rpmsave}
        ln -s %{_statedir}/registry %{php_pear_dir}/.registry
 fi
-rm -f %{php_pear_dir}/.{lock,depdb*,filemap}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -235,8 +232,8 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %{_statedir}/registry/.channel.pecl.php.net
 %ghost %{_statedir}/.depdblock
 %ghost %{_statedir}/.depdb
-%ghost %{_statedir}/.filemap
-%ghost %{_statedir}/.lock
+%ghost %{php_pear_dir}/.filemap
+%ghost %{php_pear_dir}/.lock
 
 %files core
 %defattr(644,root,root,755)