Better Makefile build, and fixes in spec file.