#4110: Fixed SPEC file; re-added Makefile
#4111: conflicts resolved and build working