SPECS (DEVEL): php-pear-PEAR.spec - using pear to install files. p...

glen glen at pld-linux.org
Sun Sep 18 01:12:48 CEST 2005


Author: glen                         Date: Sat Sep 17 23:12:48 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- using pear to install files. package filelist differs a little.
  see urpmdiff: http://glen.pastebin.com/366706

---- Files affected:
SPECS:
   php-pear-PEAR.spec (1.65 -> 1.65.2.1) 

---- Diffs:

================================================================
Index: SPECS/php-pear-PEAR.spec
diff -u SPECS/php-pear-PEAR.spec:1.65 SPECS/php-pear-PEAR.spec:1.65.2.1
--- SPECS/php-pear-PEAR.spec:1.65	Mon Sep  5 08:01:15 2005
+++ SPECS/php-pear-PEAR.spec	Sun Sep 18 01:12:43 2005
@@ -10,7 +10,8 @@
 Name:		php-pear-%{_pearname}
 Version:	1.4.0
 %define		_pre b1
-Release:	0.%{_pre}.3
+%define		_rel 3.1
+Release:	0.%{_pre}.%{_rel}
 Epoch:		1
 License:	PHP 3.0
 Group:		Development/Languages/PHP
@@ -20,7 +21,7 @@
 URL:		http://pear.php.net/package/PEAR/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	sed >= 4.0.0
-Requires:	php-pear
+Requires:	php-pear >= 4:1.0-4
 Requires:	php-cli
 Obsoletes:	php-pear-PEAR-Command
 Obsoletes:	php-pear-PEAR-Frontend-CLI
@@ -59,39 +60,16 @@
 Ta klasa ma w PEAR status: %{_status}.
 
 %prep
-%setup -q -c -n %{name}-%{version}%{_pre}
+%pear_package_setup -n %{_pearname}-%{version}%{_pre}
 %patch0 -p2
 
-%build
-# put proper paths
-sed -i -e 's, at php_dir@,%{php_pear_dir},g' -e 's, at php_bin@,%{_bindir}/php,g' %{_pearname}-%{version}%{_pre}/scripts/*
-# fix include path
-sed -i -e 's,PEAR/PackageFile/Generator/v2/rw.php,PEAR/PackageFile/v2/rw.php,g' %{_pearname}-%{version}%{_pre}/PEAR/PackageFile/v2.php
-
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{php_pear_dir}/{%{_class}/{ChannelFile,Command,Downloader,Frontend,Installer/Role,PackageFile/{Generator,Parser,v2},Task,Validator},OS},%{_bindir}}
 
-install %{_pearname}-%{version}%{_pre}/*.php $RPM_BUILD_ROOT%{php_pear_dir}
-install %{_pearname}-%{version}%{_pre}/*.dtd $RPM_BUILD_ROOT%{php_pear_dir}
-install %{_pearname}-%{version}%{_pre}/OS/*.php $RPM_BUILD_ROOT%{php_pear_dir}/OS
-install %{_pearname}-%{version}%{_pre}/%{_class}/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}
-install %{_pearname}-%{version}%{_pre}/%{_class}/ChannelFile/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/ChannelFile
-install %{_pearname}-%{version}%{_pre}/%{_class}/Command/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/Command
-install %{_pearname}-%{version}%{_pre}/%{_class}/Downloader/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/Downloader
-install %{_pearname}-%{version}%{_pre}/%{_class}/Frontend/CLI.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/Frontend
-install %{_pearname}-%{version}%{_pre}/%{_class}/Installer/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/Installer
-install %{_pearname}-%{version}%{_pre}/%{_class}/Installer/Role/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/Installer/Role
-install %{_pearname}-%{version}%{_pre}/%{_class}/PackageFile/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/PackageFile
-install %{_pearname}-%{version}%{_pre}/%{_class}/PackageFile/Generator/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/PackageFile/Generator
-install %{_pearname}-%{version}%{_pre}/%{_class}/PackageFile/Parser/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/PackageFile/Parser
-install %{_pearname}-%{version}%{_pre}/%{_class}/PackageFile/v2/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/PackageFile/v2
-install %{_pearname}-%{version}%{_pre}/%{_class}/Task/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/Task
-install %{_pearname}-%{version}%{_pre}/%{_class}/Validator/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{_class}/Validator
-install %{_pearname}-%{version}%{_pre}/scripts/pearcmd.php $RPM_BUILD_ROOT%{php_pear_dir}
-install %{_pearname}-%{version}%{_pre}/scripts/peclcmd.php $RPM_BUILD_ROOT%{php_pear_dir}
-install %{_pearname}-%{version}%{_pre}/scripts/pear.sh $RPM_BUILD_ROOT%{_bindir}/pear
-install %{_pearname}-%{version}%{_pre}/scripts/pecl.sh $RPM_BUILD_ROOT%{_bindir}/pecl
+install -d $RPM_BUILD_ROOT
+cp -a build/* $RPM_BUILD_ROOT
+
+rm -rf $RPM_BUILD_ROOT%{php_pear_dir}/.{channels,dep*,filemap,lock}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,6 +77,7 @@
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
+%{php_pear_dir}/.registry/*.reg
 %{php_pear_dir}/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -107,6 +86,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65.2.1  2005/09/17 23:12:43  glen
+- using pear to install files. package filelist differs a little.
+  see urpmdiff: http://glen.pastebin.com/366706
+
 Revision 1.65  2005/09/05 06:01:15  adamg
 - noautoreq for pear(PEAR/FTP.php)
 - release 3
================================================================

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




More information about the pld-cvs-commit mailing list