SPECS: pearize.sh, php-pear-PEAR.spec - fix conflicts parsing

[glen]

Author: glen                         Date: Mon Oct  3 23:20:59 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix conflicts parsing

---- Files affected:
SPECS:
   pearize.sh (1.21 -> 1.22) , php-pear-PEAR.spec (1.78 -> 1.79) 

---- Diffs:

================================================================
Index: SPECS/pearize.sh
diff -u SPECS/pearize.sh:1.21 SPECS/pearize.sh:1.22
--- SPECS/pearize.sh:1.21	Tue Oct  4 01:19:27 2005
+++ SPECS/pearize.sh	Tue Oct  4 01:20:54 2005
@@ -86,7 +86,7 @@
 fi
 
 if [ -n "$conflicts" ]; then
-	echo "$conflicts" | while read tag reqc; do
+	echo "$conflicts" | while read tag dep; do
 		dep=$(add_epoch $dep)
 		if ! grep -q "^Conflicts:.*$req" $preamble; then
 			sed -i -e "/^BuildRoot/iConflicts:\t$dep" $spec

================================================================
Index: SPECS/php-pear-PEAR.spec
diff -u SPECS/php-pear-PEAR.spec:1.78 SPECS/php-pear-PEAR.spec:1.79
--- SPECS/php-pear-PEAR.spec:1.78	Tue Oct  4 00:59:16 2005
+++ SPECS/php-pear-PEAR.spec	Tue Oct  4 01:20:54 2005
@@ -8,7 +8,7 @@
 Summary(pl):	%{_pearname} - podstawowa klasa dla PHP PEAR
 Name:		php-pear-%{_pearname}
 Version:	1.4.1
-Release:	2.6
+Release:	2.7
 Epoch:		1
 License:	PHP 3.0
 Group:		Development/Languages/PHP
@@ -33,6 +33,11 @@
 Obsoletes:	php-pear-PEAR-Command
 Obsoletes:	php-pear-PEAR-Frontend-CLI
 Obsoletes:	php-pear-PEAR-OS
+Conflicts:	php-pear-Archive_Tar = 1.3.0
+Conflicts:	php-pear-PEAR_Frontend_Web <= 0.5.0
+Conflicts:	php-pear-PEAR_Frontend_Web = 0.5.0
+Conflicts:	php-pear-PEAR_Frontend_Gtk <= 0.4.0
+Conflicts:	php-pear-PEAR_Frontend_Gtk = 0.4.0
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -123,6 +128,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2005/10/03 23:20:54  glen
+- fix conflicts parsing
+
 Revision 1.78  2005/10/03 22:59:16  glen
 - semi automatically added deps from pear
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pearize.sh?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/php-pear-PEAR.spec?r1=1.78&r2=1.79&f=u