Revert unwanted changes in gcc.spec brought by automatic merges