SOURCES: PEAR-makerpm1.patch (NEW) - copy to PLD CVS

[glen]

Author: glen                         Date: Wed Sep 28 21:27:39 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- copy to PLD CVS

---- Files affected:
SOURCES:
   PEAR-makerpm1.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/PEAR-makerpm1.patch
diff -u /dev/null SOURCES/PEAR-makerpm1.patch:1.1
--- /dev/null	Wed Sep 28 23:27:39 2005
+++ SOURCES/PEAR-makerpm1.patch	Wed Sep 28 23:27:34 2005
@@ -0,0 +1,20 @@
+solves for makerpm of pear 1.4.1
+
+error: line 25: Dependency tokens must begin with alpha-numeric, '_' or '/': Conflicts: php-pear-PEAR_Frontend_Web != 0.5.0
+
+but is not a real fix i guess.
+not sure does $dep['conflicts'] perhaps should have different value than empty string.
+
+--- ./PEAR/Command/Package.php~	2005-09-29 00:07:35.000000000 +0300
++++ ./PEAR/Command/Package.php	2005-09-29 00:07:37.000000000 +0300
+@@ -1010,8 +1009,8 @@
+                                     $ex = array($ex);
+                                 }
+                                 foreach ($ex as $ver) {
+-                                    if (isset($dep['conflicts'])) {
+-                                        $conflicts[] = $package . ' != ' . $ver;
++                                    if (isset($dep['conflicts']) and $dep['conflicts']) {
++                                        $conflicts[] = $package . ' != ' . $ver; # XXX: not valid .spec syntax
+                                     } else {
+                                         $conflicts[] = $package . ' = ' . $ver;
+                                     }
================================================================