SOURCES: php-pear-PEAR-rpmvars.patch - sometimes, installbasedir i...
glen
glen at pld-linux.org
Thu Sep 29 00:13:20 CEST 2005
Author: glen Date: Wed Sep 28 22:13:20 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- sometimes, installbasedir is just root dir
---- Files affected:
SOURCES:
php-pear-PEAR-rpmvars.patch (1.10 -> 1.11)
---- Diffs:
================================================================
Index: SOURCES/php-pear-PEAR-rpmvars.patch
diff -u SOURCES/php-pear-PEAR-rpmvars.patch:1.10 SOURCES/php-pear-PEAR-rpmvars.patch:1.11
--- SOURCES/php-pear-PEAR-rpmvars.patch:1.10 Thu Sep 29 00:07:31 2005
+++ SOURCES/php-pear-PEAR-rpmvars.patch Thu Sep 29 00:13:15 2005
@@ -208,3 +208,16 @@
if ($attr['role'] == 'test') {
$info['test_files'] .= "$prefix/$name\n";
+--- .//usr/share/pear/PEAR/Command/Package.php 2005-09-29 01:13:50.000000000 +0300
++++ /usr/share/pear/PEAR/Command/Package.php 2005-09-29 01:13:35.000000000 +0300
+@@ -862,8 +862,8 @@
+ break;
+ }
+ $name = str_replace('\\', '/', $name);
+- if ($attr['baseinstalldir']) {
+- $name = $attr['baseinstalldir'] . '/' . $name;
++ if (isset($attr['baseinstalldir']) and ($ttrim = trim($attr['baseinstalldir'], '/'))) {
++ $name = $ttrim . '/' . $name;
+ }
+ if ($attr['role'] == 'test') {
+ $info['test_files'] .= "$prefix/$name\n";
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/php-pear-PEAR-rpmvars.patch?r1=1.10&r2=1.11&f=u
More information about the pld-cvs-commit
mailing list