Fixing conflict error reported in forums.

Found that %dir directive in spec file causes issues.

And that %files directive can include files under folders. Simplifies things a lot.
Merge pull request #66 from ziggimon/newcifix

Fixing conflict error reported in forums.