added buildsys-macros; removed rpm