packages: php-pear/php-pear.spec - move php.net channels also here

glen glen at pld-linux.org
Wed Mar 10 14:11:06 CET 2010


Author: glen                         Date: Wed Mar 10 13:11:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move php.net channels also here

---- Files affected:
packages/php-pear:
   php-pear.spec (1.50 -> 1.51) 

---- Diffs:

================================================================
Index: packages/php-pear/php-pear.spec
diff -u packages/php-pear/php-pear.spec:1.50 packages/php-pear/php-pear.spec:1.51
--- packages/php-pear/php-pear.spec:1.50	Wed Mar 10 13:46:55 2010
+++ packages/php-pear/php-pear.spec	Wed Mar 10 14:11:01 2010
@@ -16,7 +16,7 @@
 BuildRequires:	php-pear-PEAR
 Obsoletes:	php-pear-additional_classes
 Obsoletes:	php4-pear
-Conflicts:	php-pear-PEAR < 1:1.4.6-1.3
+Conflicts:	php-pear-PEAR < 1:1.7.2-10
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -59,10 +59,14 @@
 pear -c pearrc channel-add %{SOURCE2}
 pear -c pearrc channel-add %{SOURCE3}
 
-rm -f $RPM_BUILD_ROOT%{php_pear_dir}/.channels/.alias/{pear,pecl}.txt
-rm -f $RPM_BUILD_ROOT%{php_pear_dir}/.channels/__uri.reg
-rm -f $RPM_BUILD_ROOT%{php_pear_dir}/.channels/{pear,pecl}.php.net.reg
-rm -f $RPM_BUILD_ROOT%{php_pear_dir}/{.depdb*,.filemap,.lock}
+# install PEAR registry files
+install -d $RPM_BUILD_ROOT%{php_pear_dir}/.channels/.alias
+install -d $RPM_BUILD_ROOT%{_registrydir}/{.channel.{__uri,pecl.php.net},channels/.alias}
+touch $RPM_BUILD_ROOT%{php_pear_dir}/.depdb{,lock}
+touch $RPM_BUILD_ROOT%{php_pear_dir}/.channels/{__uri,{pear,pecl}.php.net}.reg
+touch $RPM_BUILD_ROOT%{php_pear_dir}/.channels/.alias/{pear,pecl}.txt
+touch $RPM_BUILD_ROOT%{php_pear_dir}/.filemap
+touch $RPM_BUILD_ROOT%{php_pear_dir}/.lock
 
 # TODO:
 install -d $RPM_BUILD_ROOT%{_registrydir}/.channel.pear.phpdb.org
@@ -113,6 +117,10 @@
 %{php_pear_dir}/XML
 EOF
 
+%if 0
+do
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -121,10 +129,26 @@
 %dir %{php_pear_dir}
 %{php_pear_dir}/*
 
+%ghost %{php_pear_dir}/.depdblock
+%ghost %{php_pear_dir}/.depdb
+%ghost %{php_pear_dir}/.filemap
+%ghost %{php_pear_dir}/.lock
+
 %dir %{php_pear_dir}/.registry
 %dir %{php_pear_dir}/.channels
 %dir %{php_pear_dir}/.channels/.alias
 
+%{php_pear_dir}/.channels/__uri.reg
+%{php_pear_dir}/.registry/.channel.__uri
+
+%{php_pear_dir}/.channels/.alias/pear.txt
+%{php_pear_dir}/.channels/pear.php.net.reg
+
+%{php_pear_dir}/.channels/.alias/pecl.txt
+
+%{php_pear_dir}/.channels/pecl.php.net.reg
+%{php_pear_dir}/.registry/.channel.pecl.php.net
+
 %{php_pear_dir}/.channels/.alias/phpunit.txt
 %{php_pear_dir}/.channels/pear.phpunit.de.reg
 %{php_pear_dir}/.registry/.channel.pear.phpunit.de
@@ -146,6 +170,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2010/03/10 13:11:01  glen
+- move php.net channels also here
+
 Revision 1.50  2010/03/10 12:46:55  glen
 - v1.2: autogenerate deps for php-channel() deps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pear/php-pear.spec?r1=1.50&r2=1.51&f=u



More information about the pld-cvs-commit mailing list