spark: update to 1.1.1, simplify a lot
Merge pull request #5221 from offlinehacker/pkgs/spark/update

spark: update to 1.1.1, simplify a lot