Author: glen                         Date: Tue Feb 28 14:05:39 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 1.4.7
- package channel files as %ghost

---- Files affected:
SPECS:
   php-pear-PEAR.spec (1.100 -> 1.101) 

---- Diffs:

================================================================
Index: SPECS/php-pear-PEAR.spec
diff -u SPECS/php-pear-PEAR.spec:1.100 SPECS/php-pear-PEAR.spec:1.101
--- SPECS/php-pear-PEAR.spec:1.100      Mon Jan  9 14:10:22 2006
+++ SPECS/php-pear-PEAR.spec    Tue Feb 28 15:05:33 2006
@@ -1,4 +1,7 @@
 # $Revision$, $Date$
+# TODO
+# - FHS fix for .channels info
+#
 %include       /usr/lib/rpm/macros.php
 %define                _class          PEAR
 %define                _status         stable
@@ -7,13 +10,13 @@
 Summary:       %{_pearname} - main PHP PEAR class
 Summary(pl):   %{_pearname} - podstawowa klasa dla PHP PEAR
 Name:          php-pear-%{_pearname}
-Version:       1.4.6
+Version:       1.4.7
 Release:       1
 Epoch:         1
 License:       PHP 3.0
 Group:         Development/Languages/PHP
 Source0:       http://pear.php.net/get/%{_pearname}-%{version}.tgz
-# Source0-md5: 0ef3f7a2b095c290e1915d99048b7644
+# Source0-md5: d93a15102c007aa3d30f2c9018fb9981
 Source1:       %{name}-template.spec
 Patch0:                %{name}-sysconfdir.patch
 Patch1:                %{name}-rpmpkgname.patch
@@ -38,12 +41,13 @@
 Obsoletes:     php-pear-PEAR-OS
 #Suggests:     php-pear-Net_FTP
 Conflicts:     php-pear-Archive_Tar = 1.3.0
-Conflicts:     php-pear-PEAR_Frontend_Web < 0.5.0
 Conflicts:     php-pear-PEAR_Frontend_Gtk < 0.4.0
+Conflicts:     php-pear-PEAR_Frontend_Web < 0.5.0
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _noautoreq      'pear(PEAR/FTP.php)' 
'pear(Net/FTP.php)' 'pear(XML/RPC.*)'
+# PEAR_Command_Packaging is separate package
+%define                _noautoreq      'pear(PEAR/FTP.php)' 
'pear(Net/FTP.php)' 'pear(XML/RPC.*)' 'pear(PEAR/Command/Packaging.php)'
 
 %description
 The PEAR package contains:
@@ -124,6 +128,10 @@
 
 %pear_package_install
 
+cp -a ./%{php_pear_dir}/.channels $RPM_BUILD_ROOT%{php_pear_dir}/.channels
+cp -a ./%{php_pear_dir}/.registry/.channel* 
$RPM_BUILD_ROOT%{php_pear_dir}/.registry
+cp -a ./%{php_pear_dir}/.depdb* $RPM_BUILD_ROOT%{php_pear_dir}
+
 # -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
 cat > $RPM_BUILD_ROOT%{_bindir}/pear <<'EOF'
@@ -170,6 +178,19 @@
 
 %{php_pear_dir}/data/*
 
+# FIXME: FHS
+%ghost %dir %{php_pear_dir}/.channels
+%ghost %dir %{php_pear_dir}/.channels/.alias
+%ghost %{php_pear_dir}/.channels/.alias/pear.txt
+%ghost %{php_pear_dir}/.channels/.alias/pecl.txt
+%ghost %{php_pear_dir}/.channels/pear.php.net.reg
+%ghost %{php_pear_dir}/.channels/pecl.php.net.reg
+%ghost %{php_pear_dir}/.channels/__uri.reg
+%ghost %{php_pear_dir}/.registry/.channel.__uri
+%ghost %{php_pear_dir}/.registry/.channel.pecl.php.net
+%ghost %{php_pear_dir}/.depdblock
+%ghost %{php_pear_dir}/.depdb
+
 %files core
 %defattr(644,root,root,755)
 %{php_pear_dir}/PEAR.php
@@ -185,6 +206,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.101  2006/02/28 14:05:33  glen
+- 1.4.7
+- package channel files as %ghost
+
 Revision 1.100  2006/01/09 13:10:22  glen
 - up to 1.4.6
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to