Moved spec to contrib/rpm and updated Makefile.