SPECS: jakarta-log4j.spec - include macros.java, BR: jpackage-util...

[radek]

Author: radek                        Date: Sun May 21 13:54:15 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- include macros.java, BR: jpackage-utils
- BR: jmx is back (provided by java-sun-jre)
- unified build section (similar to ant.spec)

---- Files affected:
SPECS:
   jakarta-log4j.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/jakarta-log4j.spec
diff -u SPECS/jakarta-log4j.spec:1.23 SPECS/jakarta-log4j.spec:1.24
--- SPECS/jakarta-log4j.spec:1.23	Sun May 21 13:43:37 2006
+++ SPECS/jakarta-log4j.spec	Sun May 21 15:54:10 2006
@@ -4,8 +4,11 @@
 # - do something with jms / jmx requirements;
 #   http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2006-May/017648.html
 #
-# NOTE: javamail is provided by java-gnu-mail
+# NOTE:
+# - javamail is provided by java-gnu-mail
+# - jmx by java-sun-jre
 #
+%include	/usr/lib/rpm/macros.java
 Summary:	log4j - logging for Java
 Summary(pl):	log4j - zapis logów dla Javy
 Name:		jakarta-log4j
@@ -20,8 +23,9 @@
 BuildRequires:	javamail >= 1.2
 BuildRequires:	jdk >= 1.2
 #BuildRequires:	jms
+BuildRequires:	jpackage-utils
 BuildRequires:	junit >= 3.8
-#BuildRequires:	jmx
+BuildRequires:	jmx
 Requires:	javamail >= 1.2
 Requires:	jdk >= 1.2
 #Requires:	jms
@@ -52,15 +56,12 @@
 %setup -q -n logging-log4j-%{version}
 
 %build
-JAVA_HOME="%{_libdir}/java"
-CLASSPATH="$CLASSPATH:$JAVA_HOME/jre/lib/rt.jar"
-CLASSPATH="$CLASSPATH:%{_javadir}/mail.jar"
-CLASSPATH="$CLASSPATH:%{_javadir}/jms.jar"
-CLASSPATH="$CLASSPATH:%{_javadir}/activation.jar"
-CLASSPATH="$CLASSPATH:%{_javadir}/junit.jar"
-CLASSPATH="$CLASSPATH:%{_javadir}/jmxri.jar"
-CLASSPATH="$CLASSPATH:%{_javadir}/jmxtools.jar"
-export JAVA_HOME CLASSPATH
+unset JAVA_HOME || :
+export JAVA_HOME="%{java_home}"
+
+# is this required?  doesn't ant do it?
+required_jars="javamail jms activation junit jmxri jmxtools"
+export CLASSPATH="`/usr/bin/build-classpath $required_jars`"
 
 ant jar javadoc
 
@@ -88,6 +89,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2006/05/21 13:54:10  radek
+- include macros.java, BR: jpackage-utils
+- BR: jmx is back (provided by java-sun-jre)
+- unified build section (similar to ant.spec)
+
 Revision 1.23  2006/05/21 11:43:37  radek
 - BR: javamail is back, added todo & note comments
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jakarta-log4j.spec?r1=1.23&r2=1.24&f=u