[fedora-java] Further improvements for Java macros - files section simplified