SPECS: java-gnu-mail.spec - include macros.java, BR: jpackage-util...

[radek]

Author: radek                        Date: Sun May 21 13:51:48 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- include macros.java, BR: jpackage-utils, use %java{,c} macros
- ln -s gnumail.jar javamail.jar (or should it be just mail.jar?)

---- Files affected:
SPECS:
   java-gnu-mail.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/java-gnu-mail.spec
diff -u SPECS/java-gnu-mail.spec:1.3 SPECS/java-gnu-mail.spec:1.4
--- SPECS/java-gnu-mail.spec:1.3	Sun May 21 13:15:02 2006
+++ SPECS/java-gnu-mail.spec	Sun May 21 15:51:43 2006
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+%include	/usr/lib/rpm/macros.java
 Summary:	GNU JavaMail
 Name:		java-gnu-mail
 Version:	1.1.1
@@ -12,6 +13,7 @@
 BuildRequires:	automake
 BuildRequires:	java-gnu-activation
 BuildRequires:	java-gnu-inetlib
+BuildRequires:	jpackage-utils
 Requires:	jre
 Provides:	javamail = 1.3
 BuildArch:	noarch
@@ -46,8 +48,8 @@
 %{__automake}
 # Sun java requires . in CLASSPATH for configure test
 export CLASSPATH=.
-export JAVAC=%{_bindir}/javac
-export JAVA=%{_bindir}/java
+export JAVAC=%{javac}
+export JAVA=%{java}
 %configure
 
 %{__make}
@@ -59,6 +61,10 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# should it be javamail.jar or mail.jar (or both)?  log4j's build.xml
+# seeks for the former, sun's javamail contains the latter.
+ln -s gnumail.jar $RPM_BUILD_ROOT%{_javadir}/javamail.jar
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -77,6 +83,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/05/21 13:51:43  radek
+- include macros.java, BR: jpackage-utils, use %java{,c} macros
+- ln -s gnumail.jar javamail.jar (or should it be just mail.jar?)
+
 Revision 1.3  2006/05/21 11:15:02  radek
 - BR: java-gnu-activation
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/java-gnu-mail.spec?r1=1.3&r2=1.4&f=u