-%{?with_apache_bsf:BuildRequires: beanshell}
-%{?with_apache_bsf:BuildRequires: bsf}
-%{?with_javamail:BuildRequires: jaf}
-%{?with_apache_bcel:BuildRequires: jakarta-bcel}
-%{?with_commons_logging:BuildRequires: jakarta-commons-logging}
-%{?with_commons_net:BuildRequires: jakarta-commons-net}
-%{?with_apache_oro:BuildRequires: jakarta-oro}
-%{?with_apache_regexp:BuildRequires: jakarta-regexp}
-%{?with_jai:BuildRequires: jai}
-%{?with_javamail:BuildRequires: javamail}
-BuildRequires: jaxp_parser_impl
-%{?with_jdependl:BuildRequires: jdepend}
+%{?with_javamail:BuildRequires: java(jaf)}
+%{?with_jai:BuildRequires: java(jai)}
+%{?with_javamail:BuildRequires: java(javamail)}
+%{?with_apache_bsf:BuildRequires: java-beanshell}
+%{?with_apache_bcel:BuildRequires: java-bcel}
+%{?with_apache_bsf:BuildRequires: java-bsf}
+%{?with_commons_logging:BuildRequires: java-commons-logging}
+%{?with_commons_net:BuildRequires: java-commons-net1}
+%{?with_jdepend:BuildRequires: java-jdepend}
+%{?with_netrexx:BuildRequires: java-netrexx}
+%{?with_apache_oro:BuildRequires: java-oro}
+%{?with_apache_regexp:BuildRequires: java-regexp}
+%{?with_jsch:BuildRequires: java-jsch >= 0.1.21}
+BuildRequires: java-xerces
+%{?with_apache_resolver:BuildRequires: java-xml-commons-resolver}