From: pawelz <pawelz@pld-linux.org>
Date: Wed, 14 Apr 2010 22:44:59 +0000 (+0000)
Subject: - %_javasrcdir := %{_usrsrc}/java
X-Git-Tag: auto/th/rpm-build-macros-1_555-1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=e0e23dcdcc8ade02d016a77d965f81a965b24145;p=packages%2Frpm-build-macros.git

- %_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 0ff0895..6f18037 100644
--- 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 ee56656..0830da4 100644
--- 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