- %{_javadir} and %{_javadocdir} are defined in the standard RPM macros file

Changed files:
    rpm.macros -> 1.303

diff --git a/rpm.macros b/rpm.macros
index c53fff757e8ee42d1201608dc8189ef4f646f72b..59c93a9367ce45da011d20167029be06d233b8b4 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -807,9 +807,7 @@ if [ "$1" = "0" ] || [ "$2" = "0" ]; then \
 %_jvmcommonlibdir      %{_libdir}/jvm-common
 %_jvmcommondatadir     %{_datadir}/jvm-common
 %_jvmcommonsysconfdir  %{_sysconfdir}/jvm-common
-%_javadir              %{_datadir}/java
 %_jnidir               %{_libdir}/java
-%_javadocdir           %{_datadir}/javadoc
 %java_home             %(unset JAVA_HOME; . %{_javadir}-utils/java-functions; set_jvm; echo $JAVA_HOME)
 
 %ant                   JAVA_HOME=%{java_home} ant