SPECS: php-pear-PEAR.spec - almost

[glen]

Author: glen                         Date: Thu Mar 30 10:57:21 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- almost

---- Files affected:
SPECS:
   php-pear-PEAR.spec (1.115 -> 1.116) 

---- Diffs:

================================================================
Index: SPECS/php-pear-PEAR.spec
diff -u SPECS/php-pear-PEAR.spec:1.115 SPECS/php-pear-PEAR.spec:1.116
--- SPECS/php-pear-PEAR.spec:1.115	Thu Mar 30 12:35:02 2006
+++ SPECS/php-pear-PEAR.spec	Thu Mar 30 12:57:15 2006
@@ -8,7 +8,7 @@
 Summary(pl):	Podstawowy system PEAR
 Name:		php-pear-%{_pearname}
 Version:	1.4.9
-Release:	0.25
+Release:	0.26
 Epoch:		1
 License:	PHP 3.0
 Group:		Development/Languages/PHP
@@ -134,8 +134,6 @@
 %pear_package_install
 
 install -d $RPM_BUILD_ROOT%{_statedir}/channels/.alias
-mv $RPM_BUILD_ROOT{%{php_pear_dir}/.registry,%{pear_registry}}
-ln -s %{pear_registry} $RPM_BUILD_ROOT%{php_pear_dir}/.registry
 install -d $RPM_BUILD_ROOT%{pear_registry}/{.channel.{__uri,pecl.php.net},channels/.alias}
 touch $RPM_BUILD_ROOT%{_statedir}/.depdb{,lock}
 touch $RPM_BUILD_ROOT%{_statedir}/channels/{__uri,{pear,pecl}.php.net}.reg
@@ -167,10 +165,13 @@
 
 %post
 if [ ! -L %{php_pear_dir}/.registry ]; then
-	mv -f %{php_pear_dir}/.registry/*.reg %{pear_registry}
-	rmdir %{php_pear_dir}/.registry/.channel.* 2>/dev/null
-	rmdir %{php_pear_dir}/.registry/* 2>/dev/null
-	rmdir %{php_pear_dir}/.registry 2>/dev/null || mv -v %{php_pear_dir}/.registry{,.rpmsave}
+	if [ -d %{php_pear_dir}/.registry ]; then
+		install -d %{pear_registry}
+		mv -f %{php_pear_dir}/.registry/*.reg %{pear_registry}
+		rmdir %{php_pear_dir}/.registry/.channel.* 2>/dev/null
+		rmdir %{php_pear_dir}/.registry/* 2>/dev/null
+		rmdir %{php_pear_dir}/.registry 2>/dev/null || mv -v %{php_pear_dir}/.registry{,.rpmsave}
+	fi
 	ln -s %{pear_registry} %{php_pear_dir}/.registry
 fi
 
@@ -190,8 +191,7 @@
 %doc install.log optional-packages.txt
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pear.conf
 %attr(755,root,root) %{_bindir}/*
-%dir %{pear_registry}
-%{pear_registry}/*.reg
+%{php_pear_dir}/.registry/pear.reg
 %{php_pear_dir}/pearcmd.php
 %{php_pear_dir}/peclcmd.php
 %{php_pear_dir}/PEAR/[!CE]*
@@ -204,6 +204,7 @@
 
 %dir %{_statedir}
 %dir %{_statedir}/channels
+%dir %{_statedir}/registry
 %dir %{_statedir}/channels/.alias
 
 %ghost %{_statedir}/channels/.alias/pear.txt
@@ -217,7 +218,7 @@
 %ghost %{_statedir}/.depdb
 %ghost %{php_pear_dir}/.filemap
 %ghost %{php_pear_dir}/.lock
-%ghost %{php_pear_dir}/.registry
+%ghost %dir %{php_pear_dir}/.registry
 
 %files core
 %defattr(644,root,root,755)
@@ -234,6 +235,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.116  2006/03/30 10:57:15  glen
+- almost
+
 Revision 1.115  2006/03/30 10:35:02  glen
 - freaking typo isolated
 
================================================================

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