Makefile/RPM spec file: Cosmetics and smaller cleanups