Fix rpmbuild

Fixes a bunch of problems with the avocado rpm build after my reorganization patches (#270)