Author: glen Date: Wed Oct 26 15:52:01 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- hack php-pear-PEAR alpha versions to rpm versions used in PLD (like 1.4.0a1)
---- Files affected:
SOURCES:
php-pear-PEAR-rpmvars.patch (1.18 -> 1.19)
---- Diffs:
================================================================
Index: SOURCES/php-pear-PEAR-rpmvars.patch
diff -u SOURCES/php-pear-PEAR-rpmvars.patch:1.18
SOURCES/php-pear-PEAR-rpmvars.patch:1.19
--- SOURCES/php-pear-PEAR-rpmvars.patch:1.18 Wed Oct 26 17:32:21 2005
+++ SOURCES/php-pear-PEAR-rpmvars.patch Wed Oct 26 17:51:56 2005
@@ -388,3 +388,23 @@
if (function_exists('file_get_contents')) {
fclose($fp);
$spec_contents = preg_replace('/@([a-z0-9_-]+)@/e', '$info["\1"]',
+--- ./usr/share/pear/PEAR/Command/Package.php 2005-10-26 18:50:48.000000000
+0300
++++ /usr/share/pear/PEAR/Command/Package.php 2005-10-26 18:47:32.000000000
+0300
+@@ -1067,7 +1067,7 @@
+ for ($i = 0; $i < count($dep['exclude'])
- 1; $i++) {
+ $newdeprange[] = '(' .
+ $package . " {$lastmin[1]}
{$lastmin[0]} and " .
+- $package . ' < ' .
$dep[exclude][$i] . ')';
++ $package . ' < ' .
$dep['exclude'][$i] . ')';
+ $lastmin = array($dep['exclude'][$i],
'>');
+ }
+ if (isset($dep['max'])) {
+@@ -1120,7 +1120,7 @@
+ $info['package2xml'] = '';
+ // this doesn't have a package.xml version 1.0
+ $requires[] = 'php-pear-PEAR >= 1:' .
+- $deps['required']['pearinstaller']['min'];
++ preg_replace('/^([\d.]+)(.+)$/', '$1-0.$2',
$deps['required']['pearinstaller']['min']);
+ }
+ if (count($requires)) {
+ foreach ($requires as $dep) {
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/php-pear-PEAR-rpmvars.patch?r1=1.18&r2=1.19&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
