Senate makes deal on government spending bill