SOURCES: php-pear-PEAR-rpmpkgname.patch - updated to 1.4.8

glen glen at pld-linux.org
Mon Mar 6 02:13:46 CET 2006


Author: glen                         Date: Mon Mar  6 01:13:45 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 1.4.8

---- Files affected:
SOURCES:
   php-pear-PEAR-rpmpkgname.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/php-pear-PEAR-rpmpkgname.patch
diff -u SOURCES/php-pear-PEAR-rpmpkgname.patch:1.1 SOURCES/php-pear-PEAR-rpmpkgname.patch:1.2
--- SOURCES/php-pear-PEAR-rpmpkgname.patch:1.1	Mon Sep 19 22:59:24 2005
+++ SOURCES/php-pear-PEAR-rpmpkgname.patch	Mon Mar  6 02:13:40 2006
@@ -1,18 +1,19 @@
---- .//usr/share/pear/PEAR/Command/Package.php	2005-09-18 16:13:23.000000000 +0300
-+++ /usr/share/pear/PEAR/Command/Package.php	2005-09-18 16:22:11.000000000 +0300
-@@ -794,15 +794,17 @@
+--- PEAR-1.4.8/usr/share/pear/PEAR/Command/Package.php~	2006-03-06 03:09:16.000000000 +0200
++++ PEAR-1.4.8/usr/share/pear/PEAR/Command/Package.php	2006-03-06 03:11:58.000000000 +0200
+@@ -819,8 +819,10 @@
          if (isset($options['rpm-pkgname'])) {
              $rpm_pkgname_format = $options['rpm-pkgname'];
          } else {
 -            if ($pf->getChannel() == 'pear.php.net' || $pf->getChannel() == 'pecl.php.net') {
 -                $alias = 'PEAR';
-+			if ($pf->getChannel() == 'pear.php.net') {
++            if ($pf->getChannel() == 'pear.php.net') {
 +                $alias = 'php-pear';
-+			} elseif ($pf->getChannel() == 'pecl.php.net') {
++            } elseif ($pf->getChannel() == 'pecl.php.net') {
 +                $alias = 'php-pecl';
              } else {
                  $chan = &$reg->getChannel($pf->getChannel());
-                 $alias = $chan->getAlias();
+                 if (PEAR::isError($chan)) {
+@@ -830,7 +832,7 @@
                  $alias = strtoupper($alias);
                  $info['possible_channel'] = $pf->getChannel() . '/';
              }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/php-pear-PEAR-rpmpkgname.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list