SOURCES: php-pear-build-macros - default builddir to %{_pearname}-...

glen glen at pld-linux.org
Mon Sep 19 10:00:56 CEST 2005


Author: glen                         Date: Mon Sep 19 08:00:56 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- default builddir to %{_pearname}-%{version}

---- Files affected:
SOURCES:
   php-pear-build-macros (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SOURCES/php-pear-build-macros
diff -u SOURCES/php-pear-build-macros:1.9 SOURCES/php-pear-build-macros:1.10
--- SOURCES/php-pear-build-macros:1.9	Mon Sep 19 09:56:19 2005
+++ SOURCES/php-pear-build-macros	Mon Sep 19 10:00:51 2005
@@ -7,7 +7,7 @@
 #	%%pear_package_setup [-a #] [-n FMT]
 #
 # -a #   - unpack SOURCE# instead of SOURCE0
-# -n FMT - create builddir with FMT, instead of default %%{name}-%%{version}
+# -n FMT - create builddir with FMT, instead of default %%{_pearname}-%%{version}
 #
 # unpack PEAR package to %%{_builddir}/FMT. package is extracted with already
 # destination hierarchy. you should copy the tree to buildroot after
@@ -25,8 +25,8 @@
 # automatically added for this file.
 #
 %define	pear_package_setup(a:n:) \
-%setup -q -c -T %{-n:-n %{-n*}}\
-D=%{_builddir}/%{-n*}%{!-n:%{name}-%{version}} \
+%setup -q -c -T -n %{-n*}%{!-n:%{_pearname}-%{version}}\
+D=%{_builddir}/%{-n*}%{!-n:%{_pearname}-%{version}} \
 pear \\\
 	-d doc_dir=/docs \\\
 	-d php_dir=%{php_pear_dir} \\\
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/php-pear-build-macros?r1=1.9&r2=1.10&f=u




More information about the pld-cvs-commit mailing list