wok diff rpm4/receipt @ rev 9641

Fixed rhino, ecj, and xalan-xerces-j depends. Putting java-jre for depends was a bad idea since these packages are build depends for icedtea6-jdk. java-jre is a wanted package for icetea6-jdk. This was causing a depend loop.
author Christopher Rogers <slaxemulator@gmail.com>
date Wed Apr 27 16:22:35 2011 +0000 (2011-04-27)
parents 32bbe656f4ef
children 8e4c74abdf74
line diff
     1.1 --- a/rpm4/receipt	Mon Feb 07 17:19:51 2011 +0000
     1.2 +++ b/rpm4/receipt	Wed Apr 27 16:22:35 2011 +0000
     1.3 @@ -58,15 +58,15 @@
     1.4          echo ""
     1.5          echo "**** Actual RPM link : $cmd"
     1.6          echo ""
     1.7 -        echo -n "Do you want rpm  for /bin/rpm (y/N) ? : "; read anser
     1.8 -        if [ "$anser" == "y" ]; then
     1.9 +        echo -n "Do you want rpm  for /bin/rpm (Y/n) ? : "; read -t 30 anser
    1.10 +        if [ "$anser" != "n" ]; then
    1.11              echo ""
    1.12              echo -n "Removing rpm link to make a new one pointing on /usr/bin/rpm..."
    1.13              rm $root/bin/rpm && ln -sf $root/usr/bin/rpm $root/bin/rpm
    1.14              status
    1.15          else
    1.16              echo ""
    1.17 -            echo "Leaving /bin/vi to : $cmd"
    1.18 +            echo "Leaving /bin/rpm to : $cmd"
    1.19          fi
    1.20      fi
    1.21