Author: glen Date: Wed Oct 22 14:03:50 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- the both php versions autoprovs are not possible as this script is run for
each file, so no grouping possible
---- Files affected:
SOURCES:
rpm-php-requires.php (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SOURCES/rpm-php-requires.php
diff -u SOURCES/rpm-php-requires.php:1.5 SOURCES/rpm-php-requires.php:1.6
--- SOURCES/rpm-php-requires.php:1.5 Wed Oct 22 02:35:10 2008
+++ SOURCES/rpm-php-requires.php Wed Oct 22 16:03:44 2008
@@ -3,7 +3,7 @@
/**
*
* Check system dependences between php-pear modules.
- * Based on Perl version rpm-php-provides.
+ * Based on Perl version rpm-php-requires.
*
* Paweł Gołaszewski <[EMAIL PROTECTED]>
* Michał Moskal <[EMAIL PROTECTED]>
@@ -37,16 +37,12 @@
if (version_compare($res['version'], '5.0.0', 'ge')) {
$epoch = 4;
- // produce dependencies only for php5
- $compat = false;
// session, pcre are statically compiled in
// date, SPL, SimpleXML are internal for php
// sapi_apache?
$staticmods = array('standard', 'ereg', 'session', 'pcre',
'date', 'spl', 'simplexml');
} else {
$epoch = 3;
- // produce dependencies where php4/php5 both are ok
- $compat = true;
// session has always been compiled in
$staticmods = array('standard', 'ereg', 'session');
}
@@ -58,11 +54,7 @@
continue;
}
- if ($compat) {
- echo "php(", $ext, ")\n";
- } else {
- echo "php-", $ext, "\n";
- }
+ echo "php(", $ext, ")\n";
}
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-php-requires.php?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
