packages: php-pear-PEAR_Command_Packaging/php-pear-PEAR_Command_Packaging.p...

[glen]

Author: glen                         Date: Wed Oct 20 06:55:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- include channel alias for all packages (matches schema for current pecl and pear packages)

---- Files affected:
packages/php-pear-PEAR_Command_Packaging:
   php-pear-PEAR_Command_Packaging.patch (1.12 -> 1.13) , php-pear-PEAR_Command_Packaging.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: packages/php-pear-PEAR_Command_Packaging/php-pear-PEAR_Command_Packaging.patch
diff -u packages/php-pear-PEAR_Command_Packaging/php-pear-PEAR_Command_Packaging.patch:1.12 packages/php-pear-PEAR_Command_Packaging/php-pear-PEAR_Command_Packaging.patch:1.13
--- packages/php-pear-PEAR_Command_Packaging/php-pear-PEAR_Command_Packaging.patch:1.12	Sun Aug 22 11:08:56 2010
+++ packages/php-pear-PEAR_Command_Packaging/php-pear-PEAR_Command_Packaging.patch	Wed Oct 20 08:55:48 2010
@@ -1,5 +1,5 @@
---- PEAR_Command_Packaging-0.2.0/usr/share/pear/PEAR/Command/Packaging.php	2010-08-22 11:54:43.779087274 +0300
-+++ PEAR_Command_Packaging-0.2.0/usr/share/pear/PEAR/Command/Packaging.php	2010-08-22 12:06:43.302565187 +0300
+--- PEAR_Command_Packaging-0.2.0/usr/share/pear/PEAR/Command/Packaging.php	2010-08-22 12:06:43.302565187 +0300
++++ PEAR_Command_Packaging-0.2.0/usr/share/pear/PEAR/Command/Packaging.php	2010-10-20 09:36:32.428771477 +0300
 @@ -54,6 +54,11 @@
                      'arg' => 'FILE',
                      'doc' => 'Use FILE as RPM spec file template'
@@ -17,7 +17,7 @@
       */
      var $_rpm_pkgname_format = array(
 -        'pkg'  => '%C::%s',
-+        'pkg'  => 'php-%s',
++        'pkg'  => 'php-%c-%s',
          'chan' => 'php-channel-%c',
      );
 -    
@@ -25,9 +25,12 @@
      /**
       * The default format of various dependencies that might be generated in the
       * spec file. The currently-handled dependency types are:
-@@ -142,7 +147,9 @@
+@@ -140,9 +145,11 @@
+      * %P   = use the same as whatever rpm_pkgname_format is set to be
+      */
      var $_rpm_depname_format = array(
-         'pkg'  => '%P',
+-        'pkg'  => '%P',
++        'pkg'  => 'php-%c-%s',
          'ext'  => 'php-%l',
 -        'php'  => 'php',
 +        'pear-pkg' => 'php-pear-%s',

================================================================
Index: packages/php-pear-PEAR_Command_Packaging/php-pear-PEAR_Command_Packaging.spec
diff -u packages/php-pear-PEAR_Command_Packaging/php-pear-PEAR_Command_Packaging.spec:1.24 packages/php-pear-PEAR_Command_Packaging/php-pear-PEAR_Command_Packaging.spec:1.25
--- packages/php-pear-PEAR_Command_Packaging/php-pear-PEAR_Command_Packaging.spec:1.24	Sat Oct  2 17:44:13 2010
+++ packages/php-pear-PEAR_Command_Packaging/php-pear-PEAR_Command_Packaging.spec	Wed Oct 20 08:55:48 2010
@@ -12,7 +12,7 @@
 #  %{php_pear_dir}/.registry/*.reg
 #  %{php_pear_dir}/.registry/.channel.*/*.reg
 # - handle php-PKGNAME names (actual non pear packages)
-# - php-lc(<CHANNEL_ALIAS>)-<PKGNAME>?
+# - php-lc(<CHANNEL_ALIAS>)-<PKGNAME>
 %include	/usr/lib/rpm/macros.php
 %define		_status		alpha
 %define		_pearname	PEAR_Command_Packaging
@@ -104,6 +104,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2010/10/20 06:55:48  glen
+- include channel alias for all packages (matches schema for current pecl and pear packages)
+
 Revision 1.24  2010/10/02 15:44:13  glen
 - our pear scripts always rename to package.xml
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pear-PEAR_Command_Packaging/php-pear-PEAR_Command_Packaging.patch?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pear-PEAR_Command_Packaging/php-pear-PEAR_Command_Packaging.spec?r1=1.24&r2=1.25&f=u