- fiddle with pear vs core only requires line

Changed files:
    pearize.sh -> 1.52

diff --git a/pearize.sh b/pearize.sh
index 68445e288e776ecde424770c10d3202033c1bd88..7c227519d721615c3fa780860a50dab1be381588 100644 (file)
--- a/pearize.sh
+++ b/pearize.sh
@@ -74,21 +74,8 @@ template=.$template~
 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 @@ if [ -n "$requires" ]; then
        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 @@ if ! diff -u $bak $spec > $diff; then
 else
        echo "$spec: No diffs"
 fi
-#exit 1