packages: java-junit/java-junit.spec - builds with java-sun ClassDataVersio...

[glen]

Author: glen                         Date: Thu May 21 18:30:45 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- builds with java-sun ClassDataVersion=49.0

---- Files affected:
packages/java-junit:
   java-junit.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: packages/java-junit/java-junit.spec
diff -u packages/java-junit/java-junit.spec:1.30 packages/java-junit/java-junit.spec:1.31
--- packages/java-junit/java-junit.spec:1.30	Thu May 21 19:45:25 2009
+++ packages/java-junit/java-junit.spec	Thu May 21 20:30:39 2009
@@ -68,9 +68,11 @@
 rm -f junit/runner/Version.java.template
 
 %build
-export CLASSPATH=$(build-classpath hamcrest-core)
+required_jars="hamcrest-core"
+CLASSPATH=$(build-classpath $required_jars)
+export CLASSPATH
 
-%javac $(find -name '*.java')
+%javac -target 1.5 -source 1.5 $(find -name '*.java')
 %jar -cvf %{srcname}-%{version}.jar $(find -type f '!' -name '*.java')
 %{?with_javadoc:%javadoc -d javadoc $(find -name '*.java')}
 
@@ -81,7 +83,7 @@
 ln -sf junit-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/junit.jar
 
 # javadoc
-%if %{with_javadoc}
+%if %{with javadoc}
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
 cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
 ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
@@ -97,10 +99,11 @@
 %defattr(644,root,root,755)
 %{_javadir}/*.jar
 
-%if %{with_javadoc}
+%if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -109,6 +112,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2009/05/21 18:30:39  glen
+- builds with java-sun ClassDataVersion=49.0
+
 Revision 1.30  2009/05/21 17:45:25  glen
 - two more
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-junit/java-junit.spec?r1=1.30&r2=1.31&f=u