Author: glen Date: Tue Jan 12 14:33:57 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- php-<name> only deps for php5
---- Files affected:
packages/rpm:
rpm-php-requires.php (1.13 -> 1.14)
---- Diffs:
================================================================
Index: packages/rpm/rpm-php-requires.php
diff -u packages/rpm/rpm-php-requires.php:1.13
packages/rpm/rpm-php-requires.php:1.14
--- packages/rpm/rpm-php-requires.php:1.13 Mon Dec 7 20:24:20 2009
+++ packages/rpm/rpm-php-requires.php Tue Jan 12 15:33:50 2010
@@ -121,8 +121,12 @@
$version = max(PHP_MIN_VERSION, $res['version']);
if (version_compare($version, '5.0.0', 'ge')) {
+ # force php-<name> only deps when php5
+ # XXX what about php-pecl-<name> virtual provides?
+ $fmt = 'php-%s';
$epoch = 4;
} else {
+ $fmt = 'php(%s)';
$epoch = 3;
}
echo "php-common >= ", $epoch, ":", $version, "\n";
@@ -133,8 +137,12 @@
if ($ext == 'bz2') {
$ext = 'bzip2';
}
-
- echo "php(", $ext, ")\n";
+ // ereg
+ if ($ext == 'ereg') {
+ // not yet
+ continue;
+ }
+ printf("$fmt\n", $ext);
}
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-php-requires.php?r1=1.13&r2=1.14&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
