SPECS (DEVEL): php-pear-PEAR.spec - remove builddir hack

glen glen at pld-linux.org
Sun Sep 18 01:40:35 CEST 2005


Author: glen                         Date: Sat Sep 17 23:40:35 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- remove builddir hack

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

---- Diffs:

================================================================
Index: SPECS/php-pear-PEAR.spec
diff -u SPECS/php-pear-PEAR.spec:1.65.2.1 SPECS/php-pear-PEAR.spec:1.65.2.2
--- SPECS/php-pear-PEAR.spec:1.65.2.1	Sun Sep 18 01:12:43 2005
+++ SPECS/php-pear-PEAR.spec	Sun Sep 18 01:40:30 2005
@@ -10,7 +10,7 @@
 Name:		php-pear-%{_pearname}
 Version:	1.4.0
 %define		_pre b1
-%define		_rel 3.1
+%define		_rel 3.3
 Release:	0.%{_pre}.%{_rel}
 Epoch:		1
 License:	PHP 3.0
@@ -63,11 +63,14 @@
 %pear_package_setup -n %{_pearname}-%{version}%{_pre}
 %patch0 -p2
 
+# don't know why this happens:
+grep -rl "%{_builddir}/%{name}-%{version}" usr | xargs -r sed -i -e "s,%{_builddir}/%{name}-%{version},,"
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT
-cp -a build/* $RPM_BUILD_ROOT
+cp -a usr $RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{php_pear_dir}/.{channels,dep*,filemap,lock}
 
@@ -86,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65.2.2  2005/09/17 23:40:30  glen
+- remove builddir hack
+
 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
================================================================

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




More information about the pld-cvs-commit mailing list