SPECS: ant.spec - use %{java_home} macro (computet by jpackage-uti...

[jajcus]

Author: jajcus                       Date: Sat May 20 18:00:54 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %{java_home} macro (computet by jpackage-utils) to get valid JAVA_HOME
  and ignore environment setting
- do not force specific jaf/javamail implementation (let jpackage choose it)
  (specific impl. may be enforced by BR only in future)

---- Files affected:
SPECS:
   ant.spec (1.48 -> 1.49) 

---- Diffs:

================================================================
Index: SPECS/ant.spec
diff -u SPECS/ant.spec:1.48 SPECS/ant.spec:1.49
--- SPECS/ant.spec:1.48	Fri May 19 15:48:29 2006
+++ SPECS/ant.spec	Sat May 20 20:00:48 2006
@@ -58,8 +58,8 @@
 %{?with_apache_log4j:BuildRequires:	jakarta-log4j}
 %{?with_apache_oro:BuildRequires:	jakarta-oro}
 %{?with_apache_regexp:BuildRequires:	jakarta-regexp}
-%{?with_javamail:BuildRequires:	java-gnu-activation}
-%{?with_javamail:BuildRequires:	java-gnu-mail}
+%{?with_javamail:BuildRequires:	jaf}
+%{?with_javamail:BuildRequires:	javamail}
 BuildRequires:	jdk
 %{?with_jsch:BuildRequires:	jsch}
 %{?with_junit:BuildRequires:	junit}
@@ -404,9 +404,10 @@
 find . -name "*.jar" -exec rm -f {} \;
 
 %build
-export JAVA_HOME=%{_libdir}/java
 
-export CLASSPATH=""
+unset JAVA_HOME
+export JAVA_HOME="%{java_home}" 
+
 required_jars="jaxp_parser_impl"
 %{?with_junit:required_jars="$required_jars junit"}
 %{?with_antlr:required_jars="$required_jars antlr"}
@@ -419,13 +420,12 @@
 %{?with_apache_log4j:required_jars="$required_jars log4j"}
 %{?with_apache_oro:required_jars="$required_jars oro"}
 %{?with_apache_regexp:required_jars="$required_jars regexp"}
-%{?with_javamail:required_jars="$required_jars java-gnu-mail java-gnu-activation"}
+%{?with_javamail:required_jars="$required_jars javamail/mailapi jaf"}
 %{?with_jdepend:required_jars="$required_jars jdepend"}
 %{?with_jsch:required_jars="$required_jars jsch"}
 
-CLASSPATH="`/usr/bin/build-classpath $required_jars`"
+export CLASSPATH="`/usr/bin/build-classpath $required_jars`"
 
-export JAVA_HOME=%{java_home}
 sh build.sh --noconfig main javadocs
 
 %install
@@ -518,7 +518,7 @@
 
 %if %{with javamail}
 install build/lib/%{name}-javamail.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-javamail-%{version}.jar
-echo "java-gnu-mail java-gnu-activation ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/javamail
+echo "javamail/mailapi jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/javamail
 %endif
 
 %if %{with jdepend}
@@ -744,6 +744,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49  2006/05/20 18:00:48  jajcus
+- use %{java_home} macro (computet by jpackage-utils) to get valid JAVA_HOME
+  and ignore environment setting
+- do not force specific jaf/javamail implementation (let jpackage choose it)
+  (specific impl. may be enforced by BR only in future)
+
 Revision 1.48  2006/05/19 13:48:29  jajcus
 - use jpackage-utils for rpm macros and preparing $CLASSPATH
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ant.spec?r1=1.48&r2=1.49&f=u