SOURCES: php-pear-PEAR-rpmvars.patch - package v1.0 does not have ...

glen glen at pld-linux.org
Mon Oct 3 22:11:02 CEST 2005


Author: glen                         Date: Mon Oct  3 20:11:01 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- package v1.0 does not have any channel information, assume pecl packages for all lowercased names

---- Files affected:
SOURCES:
   php-pear-PEAR-rpmvars.patch (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SOURCES/php-pear-PEAR-rpmvars.patch
diff -u SOURCES/php-pear-PEAR-rpmvars.patch:1.12 SOURCES/php-pear-PEAR-rpmvars.patch:1.13
--- SOURCES/php-pear-PEAR-rpmvars.patch:1.12	Mon Oct  3 15:07:00 2005
+++ SOURCES/php-pear-PEAR-rpmvars.patch	Mon Oct  3 22:10:56 2005
@@ -297,3 +297,19 @@
  
  						if (isset($dep['channel']) && $dep['channel'] != 'pear.php.net' &&
  							  $dep['channel'] != 'pecl.php.net') {
+--- ./usr/share/pear/PEAR/Command/Package.php	2005-10-03 12:01:39.000000000 +0300
++++ /usr/share/pear/PEAR/Command/Package.php	2005-10-03 23:04:41.000000000 +0300
+@@ -946,7 +946,12 @@
+ 							$chan = &$reg->getChannel($dep['channel']);
+ 							$package = strtoupper($chan->getAlias()) . '::' . $dep['name'];
+ 						} else {
+-							$package = 'php-pear-' . $dep['name'];
++							// assume lowercased package name as pecl
++							if (strtolower($dep['name']) == $dep['name']) {
++								$package = 'php-pecl-' . $dep['name'];
++							} else {
++								$package = 'php-pear-' . $dep['name'];
++							}
+ 						}
+                     }
+                     $trans = array(
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/php-pear-PEAR-rpmvars.patch?r1=1.12&r2=1.13&f=u




More information about the pld-cvs-commit mailing list