Changed /var/lib references to _sharedstatedir.  Additional minor changes
to symlink/upgrade logic
Changes for guava 17.0
Removed exclude states in files section
Fixed FTBFS (BZ1106748)
Bump spec to 2.4.0-3