- let %{php_pear_dir}/.registry be here; rel 14

[packages/php-pear.git] / php-pear.spec

diff --git a/php-pear.spec b/php-pear.spec
index 7446cb51a8c01c2f4d36d7c53b6137c53d9c2f1f..76dfbbdba307b392ea422bf1da76fcf80ed8b298 100644 (file)
--- a/php-pear.spec
+++ b/php-pear.spec
@@ -2,15 +2,14 @@ Summary:      PEAR - PHP Extension and Application Repository
 Summary(pl):   PEAR - rozszerzenie PHP i repozytorium aplikacji
 Name:          php-pear
 Version:       1.0
-Release:       10
+Release:       14
 Epoch:         4
 License:       Public Domain
 Group:         Development/Languages/PHP
-Requires:      php-pcre
-Requires:      php-xml
+Provides:      php4-pear = %{epoch}:%{version}-%{release}
 Obsoletes:     php-pear-additional_classes
 Obsoletes:     php4-pear
-Provides:      php4-pear = %{epoch}:%{version}-%{release}
+Conflicts:     php-pear-PEAR < 1:1.4.6-1.3
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -40,6 +39,7 @@ install -d $RPM_BUILD_ROOT%{php_pear_dir}/{data,tests}
 while read dir; do
        install -d $RPM_BUILD_ROOT$dir
 done <<EOF
+%{php_pear_dir}/.registry
 %{php_pear_dir}/Archive
 %{php_pear_dir}/Auth
 %{php_pear_dir}/Console
@@ -60,7 +60,6 @@ done <<EOF
 %{php_pear_dir}/Net
 %{php_pear_dir}/Numbers
 %{php_pear_dir}/Payment
-%{php_pear_dir}/PEAR
 %{php_pear_dir}/PHP
 %{php_pear_dir}/Science
 %{php_pear_dir}/Services
@@ -71,31 +70,9 @@ done <<EOF
 %{php_pear_dir}/Validate/Finance
 EOF
 
-# registry
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{php_pear_dir}/.registry}
-> $RPM_BUILD_ROOT%{php_pear_dir}/.filemap
-> $RPM_BUILD_ROOT%{php_pear_dir}/.lock
-
-%post
-umask 002
-if [ ! -e %{php_pear_dir}/.filemap ]; then
-       touch %{php_pear_dir}/.filemap
-fi
-if [ ! -e %{php_pear_dir}/.lock ]; then
-       touch %{php_pear_dir}/.lock
-fi
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%dir %{php_pear_dir}
-# LANG=C is in 'prep', so this should work in locales like et_EE where [a-z] does not specify whole alphabet
-%{php_pear_dir}/[A-Z]*
-
-# see 'pear config-show'
-%dir %{php_pear_dir}/data
-%dir %{php_pear_dir}/tests
-
-# registry
-%dir %{php_pear_dir}/.registry
-%ghost %{php_pear_dir}/.filemap
-%ghost %{php_pear_dir}/.lock
+%{php_pear_dir}