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

[glen]

Author: glen                         Date: Sat Aug 21 18:10:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- todos

---- Files affected:
packages/php-pear-PEAR_Command_Packaging:
   php-pear-PEAR_Command_Packaging.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
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.19 packages/php-pear-PEAR_Command_Packaging/php-pear-PEAR_Command_Packaging.spec:1.20
--- packages/php-pear-PEAR_Command_Packaging/php-pear-PEAR_Command_Packaging.spec:1.19	Sat Aug 21 14:34:15 2010
+++ packages/php-pear-PEAR_Command_Packaging/php-pear-PEAR_Command_Packaging.spec	Sat Aug 21 20:10:01 2010
@@ -1,6 +1,12 @@
 # $Revision$, $Date$
 # TODO
 # - finish ../SOURCES/php-pear-PEAR-rpmvars.patch merge
+# - merge conflict + upper to ">":
+#   Requires:   php-pear-Mail_Mime >= 1.4.0
+#   Conflicts:  php-pear-Mail_Mime = 1.4.0
+#   ->
+#   Requires:   php-pear-Mail_Mime > 1.4.0
+# - think something for creole and jargon deps (Mail_Queue)
 %include	/usr/lib/rpm/macros.php
 %define		_status		alpha
 %define		_pearname	PEAR_Command_Packaging
@@ -14,7 +20,7 @@
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
 # Source0-md5:	457881b46b8c42ba58cdb698872df2e6
 Source1:	php-pear-PEAR-template.spec
-Patch0:		php-pear-PEAR_Command_Packaging.patch
+Patch0:		%{name}.patch
 URL:		http://pear.php.net/package/PEAR_Command_Packaging/
 BuildRequires:	php-packagexml2cl
 BuildRequires:	php-pear-PEAR >= 1:1.4.3
@@ -92,6 +98,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2010/08/21 18:10:01  glen
+- todos
+
 Revision 1.19  2010/08/21 12:34:15  glen
 - recognize pecl/pear deps in package 1.0 format
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pear-PEAR_Command_Packaging/php-pear-PEAR_Command_Packaging.spec?r1=1.19&r2=1.20&f=u