packages: pearize.sh - fiddle with pear vs core only requires line

[glen]

Author: glen                         Date: Sat Aug 21 11:05:18 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fiddle with pear vs core only requires line

---- Files affected:
packages:
   pearize.sh (1.51 -> 1.52) 

---- Diffs:

================================================================
Index: packages/pearize.sh
diff -u packages/pearize.sh:1.51 packages/pearize.sh:1.52
--- packages/pearize.sh:1.51	Sat Aug 21 12:54:51 2010
+++ packages/pearize.sh	Sat Aug 21 13:05:12 2010
@@ -74,21 +74,8 @@
 add_epoch() {
 	local dep="$@"
 	local pkg="$1"
-	local qual="$2"
 	local ver="$3"
 
-	if [ "$pkg" == "php-pear-PEAR" ]; then
-		pkg="php-pear-PEAR-core"
-	fi
-
-	case "$pkg" in
-	php-pear-PEAR-core)
-		ver=$(echo "$ver" | sed -e 's,1.4.0b1,1.4.0-0.b1,')
-		;;
-	esac
-
-	dep="$pkg $qual $ver"
-
 	# already have epoch
 	if [[ "$ver" = *:* ]]; then
 		echo "$dep"
@@ -127,6 +114,7 @@
 	echo "$requires" | while read tag dep; do
 		dep=$(add_epoch $dep)
 		if ! grep -q "^Requires:.*$dep" $preamble; then
+			dep=$(echo "$dep" | sed -e 's,php-pear-PEAR\b,php-pear-PEAR-core,')
 			sed -i -e "/^BuildRoot/iRequires:\t$dep" $spec
 		fi
 	done
@@ -239,4 +227,3 @@
 else
 	echo "$spec: No diffs"
 fi
-#exit 1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pearize.sh?r1=1.51&r2=1.52&f=u