SOURCES: rpm.macros - avoid shell errors if jpackage-utils is not ...

[glen]

Author: glen                         Date: Tue Jan  2 20:39:53 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- avoid shell errors if jpackage-utils is not installed

---- Files affected:
SOURCES:
   rpm.macros (1.360 -> 1.361) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.360 SOURCES/rpm.macros:1.361
--- SOURCES/rpm.macros:1.360	Tue Jan  2 19:07:50 2007
+++ SOURCES/rpm.macros	Tue Jan  2 21:39:48 2007
@@ -956,11 +956,11 @@
 %_jvmcommondatadir	%{_datadir}/jvm-common
 %_jvmcommonsysconfdir	%{_sysconfdir}/jvm-common
 %_jnidir		%{_libdir}/java
-%java_home		%(unset JAVA_HOME; . %{_javadir}-utils/java-functions; set_jvm; echo $JAVA_HOME)
+%java_home		%([ -f %{_javadir}-utils/java-functions ] || { echo ERROR; exit 0; }; unset JAVA_HOME; . %{_javadir}-utils/java-functions; set_jvm; echo ${JAVA_HOME:-ERROR})
 
 %ant			JAVA_HOME=%{java_home} ant
 %jar			%{java_home}/bin/jar
-%java			%(unset JAVACMD; . %{_javadir}-utils/java-functions; set_javacmd; echo $JAVACMD)
+%java			%([ -f %{_javadir}-utils/java-functions ] || { echo ERROR; exit 0; }; unset JAVACMD; . %{_javadir}-utils/java-functions; set_javacmd; echo $JAVACMD)
 %javac			%{java_home}/bin/javac
 %javadoc		%{java_home}/bin/javadoc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.360&r2=1.361&f=u