Update several patches and include changes from tools/make_specfiles and tools/make_makefiles.