]> git.pld-linux.org Git - packages/php-pear-PEAR.git/commitdiff
- outdated in 1.4.2
authorElan Ruusamäe <glen@pld-linux.org>
Sat, 15 Oct 2005 12:26:12 +0000 (12:26 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    PEAR-makerpm1.patch -> 1.2

PEAR-makerpm1.patch [deleted file]

diff --git a/PEAR-makerpm1.patch b/PEAR-makerpm1.patch
deleted file mode 100644 (file)
index ea28259..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-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;
-                                     }
This page took 0.061247 seconds and 4 git commands to generate.