SPECS: php-pear-PEAR.spec - lock and filemap not moved to /var unt...

[glen]

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

---- Files affected:
SPECS:
   php-pear-PEAR.spec (1.112 -> 1.113) 

---- Diffs:

================================================================
Index: SPECS/php-pear-PEAR.spec
diff -u SPECS/php-pear-PEAR.spec:1.112 SPECS/php-pear-PEAR.spec:1.113
--- SPECS/php-pear-PEAR.spec:1.112	Tue Mar  7 11:20:48 2006
+++ SPECS/php-pear-PEAR.spec	Tue Mar  7 19:20:11 2006
@@ -8,7 +8,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}
@@ -30,13 +30,11 @@
 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
@@ -158,8 +156,8 @@
 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
@@ -184,24 +182,23 @@
 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
@@ -236,8 +233,8 @@
 %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)
@@ -254,6 +251,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.113  2006/03/07 18:20:11  glen
+- lock and filemap not moved to /var until install is fixed
+
 Revision 1.112  2006/03/07 10:20:48  glen
 - BR php-pear-PEAR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php-pear-PEAR.spec?r1=1.112&r2=1.113&f=u