Congress votes for spending bill without Trump energy cuts