- %_javasrcdir := %{_usrsrc}/java

- 1.555

Changed files:
    rpm-build-macros.spec -> 1.251
    rpm.macros -> 1.555

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 0ff0895e3779a87c8c85da22fc9f9492d7290ea7..6f180372c0fe0c948c23a0cc5ea602605c5e4239 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.554
+%define                rpm_macros_rev  1.555
 %define                find_lang_rev   1.32
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD

diff --git a/rpm.macros b/rpm.macros
index ee5665656e74b88e47db9301e1b63dc5058fff86..0830da490076a8cfaea27ce5375f436622cfcbcc 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1207,6 +1207,8 @@ fi \
 
 %java_home             %{expand:%%global java_home %([ -f %{_javadir}-utils/java-functions ] || { echo ERROR; exit 0; }; unset JAVA_HOME; . %{_javadir}-utils/java-functions; set_jvm; echo ${JAVA_HOME:-ERROR})}%java_home
 
+%_javasrcdir   %{_usrsrc}/java
+
 %ant                   JAVA_HOME=%{java_home} CLASSPATH=$CLASSPATH ant
 %jar                   %{java_home}/bin/jar
 %java                  %{expand:%%global java %([ -f %{_javadir}-utils/java-functions ] || { echo ERROR; exit 0; }; unset JAVACMD; . %{_javadir}-utils/java-functions; set_javacmd; echo $JAVACMD)}%java