From: Jacek Konieczny <jajcus@pld-linux.org>
Date: Thu, 25 May 2006 07:26:25 +0000 (+0000)
Subject: - %{_javadir} and %{_javadocdir} are defined in the standard RPM macros file
X-Git-Tag: auto/th/rpm-build-macros-1_303-1~1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=ef64e68a976d2abcc35db4596f07342928873a65;p=packages%2Frpm-pld-macros.git

- %{_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 c53fff7..59c93a9 100644
--- 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