use _javadir macro instead
Group (Build)Requires for el6,el7, & fedora

The original if/else logic was broken and would cause
el7 to pull in the wrong dependencies. I've grouped them to make
them easier to work with (and it's apparent what goes with what).
Fix el7 build deps