update spec file and add missing subdirs in Makefile.am

Original commit message from CVS:
update spec file and add missing subdirs in Makefile.am
2 files changed