Author: glen Date: Sat Oct 15 12:25:13 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- update to 1.4.2
---- Files affected:
SOURCES:
php-pear-PEAR-rpmvars.patch (1.15 -> 1.16)
---- Diffs:
================================================================
Index: SOURCES/php-pear-PEAR-rpmvars.patch
diff -u SOURCES/php-pear-PEAR-rpmvars.patch:1.15
SOURCES/php-pear-PEAR-rpmvars.patch:1.16
--- SOURCES/php-pear-PEAR-rpmvars.patch:1.15 Mon Oct 3 23:31:56 2005
+++ SOURCES/php-pear-PEAR-rpmvars.patch Sat Oct 15 14:25:07 2005
@@ -49,14 +49,10 @@
}
if (!isset($dep['min']) && !isset($dep['max']) &&
!isset($dep['exclude'])) {
-@@ -996,15 +1000,19 @@
- $tar->popErrorHandling();
- if ($a === null || PEAR::isError($a)) {
- // this doesn't have a package.xml version 1.0
-- $requires[] = 'PEAR::PEAR >= ' .
-+ $requires[] = 'php-pear-PEAR >= ' .
- $deps['required']['pearinstaller']['min'] .
"\n";
- }
+--- ./usr/share/pear/PEAR/Command/Package.php~ 2005-10-15 15:16:44.000000000
+0300
++++ ./usr/share/pear/PEAR/Command/Package.php 2005-10-15 15:19:02.000000000
+0300
+@@ -1116,10 +1116,14 @@
+ $deps['required']['pearinstaller']['min'];
}
if (count($requires)) {
- $info['extra_headers'] .= 'Requires: ' . implode(',
', $requires) . "\n";
@@ -185,17 +181,17 @@
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-09-29 00:26:51.000000000
+0300
-+++ /usr/share/pear/PEAR/Command/Package.php 2005-09-29 00:26:38.000000000
+0300
-@@ -1024,7 +1024,7 @@
- $tar->popErrorHandling();
- if ($a === null || PEAR::isError($a)) {
- // this doesn't have a package.xml version 1.0
-- $requires[] = 'php-pear-PEAR >= ' .
-+ $requires[] = 'php-pear-PEAR >= 1:' .
- $deps['required']['pearinstaller']['min'] .
"\n";
- }
+--- ./usr/share/pear/PEAR/Command/Package.php~ 2005-10-15 15:12:41.000000000
+0300
++++ ./usr/share/pear/PEAR/Command/Package.php 2005-10-15 15:14:30.000000000
+0300
+@@ -1112,7 +1112,7 @@
+ if ($a === null || PEAR::isError($a)) {
+ $info['package2xml'] = '';
+ // this doesn't have a package.xml version 1.0
+- $requires[] = 'PEAR::PEAR >= ' .
++ $requires[] = 'php-pear-PEAR >= 1' .
+ $deps['required']['pearinstaller']['min'];
}
+ if (count($requires)) {
--- .//usr/share/pear/PEAR/Command/Package.php 2005-09-29 00:58:11.000000000
+0300
+++ /usr/share/pear/PEAR/Command/Package.php 2005-09-29 01:06:46.000000000
+0300
@@ -862,6 +862,9 @@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/php-pear-PEAR-rpmvars.patch?r1=1.15&r2=1.16&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
