Author: glen Date: Tue Dec 13 10:39:09 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- parse optional packagage info for v2 package2.xml
---- Files affected:
SOURCES:
php-pear-PEAR-rpmvars.patch (1.20 -> 1.21)
---- Diffs:
================================================================
Index: SOURCES/php-pear-PEAR-rpmvars.patch
diff -u SOURCES/php-pear-PEAR-rpmvars.patch:1.20
SOURCES/php-pear-PEAR-rpmvars.patch:1.21
--- SOURCES/php-pear-PEAR-rpmvars.patch:1.20 Sat Nov 5 19:42:54 2005
+++ SOURCES/php-pear-PEAR-rpmvars.patch Tue Dec 13 11:39:04 2005
@@ -399,3 +399,26 @@
}
if (count($requires)) {
foreach ($requires as $dep) {
+--- ./usr/share/pear/PEAR/Command/Package.php 2005-12-10 02:02:11.000000000
+0200
++++ /usr/share/pear/PEAR/Command/Package.php 2005-12-13 01:44:56.000000000
+0200
+@@ -1133,6 +1135,20 @@
+ }
+ }
+ }
++
++ if (isset($deps['optional']['package'])) {
++ $a = $deps['optional']['package'];
++ foreach ((isset($a[0]) ? $a :
array($a)) as $dep) {
++ $info['optional'] .= "'pear(".
str_replace('_', '/', $dep['name']) . ".*)' ";
++ $info['optional-pkg'][] =
'php-pear-'. $dep['name'];
++ }
++ }
++ if (isset($deps['optional']['extension'])) {
++ $a = $deps['optional']['extension'];
++ foreach (isset($a[0]) ? $a : array($a)
as $dep) {
++ $info['optional-ext'][] =
'php-' . $dep['name'];
++ }
++ }
+ }
+ }
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/php-pear-PEAR-rpmvars.patch?r1=1.20&r2=1.21&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
