Author: pawelz Date: Thu Aug 20 10:52:15 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- now it builds with both jdks, so droped prebuilt version
- BR: java-qdox
- if with gcj, BR gcc-java >= 6:4.4.0 (needs full java 5)
- fixed generation of javadoc with java_sun
- rel 4
---- Files affected:
packages/java-junit:
java-junit.spec (1.32 -> 1.33)
---- Diffs:
================================================================
Index: packages/java-junit/java-junit.spec
diff -u packages/java-junit/java-junit.spec:1.32
packages/java-junit/java-junit.spec:1.33
--- packages/java-junit/java-junit.spec:1.32 Thu May 21 20:34:59 2009
+++ packages/java-junit/java-junit.spec Thu Aug 20 12:52:09 2009
@@ -1,26 +1,12 @@
# $Revision$, $Date$
-# TODO
-# will not build with gcj:
-# Syntax error, annotations are only available if source level is 5.0
-# Syntax error, static imports are only available if source level is 5.0
-# Syntax error, parameterized types are only available if source level is 5.0
-# Syntax error, varargs are only available if source level is 5.0
-# Syntax error, annotation declarations are only available if source level is
5.0
-# Syntax error, type parameters are only available if source level is 5.0
-#
+
# Conditional build:
-%bcond_without javadoc # don't build javadoc
-%bcond_with binary # do not compile .jars from source use bundled
ones
+%bcond_without javadoc # don't build javadoc
%if "%{pld_release}" == "ti"
-%bcond_without java_sun # build with gcj
+%bcond_without java_sun # build with gcj
%else
-%bcond_without java_sun # build with java-sun
-%endif
-
-# HACK: use binary where java-sun not available
-%ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
-%define with_binary 1
+%bcond_with java_sun # build with java-sun
%endif
%define srcname junit
@@ -29,24 +15,23 @@
Summary(pl.UTF-8): JUnit - środowisko do testów regresji
Name: java-junit
Version: 4.4
-Release: 3
+Release: 4
License: IBM Common Public License v1.0
Group: Libraries/Java
Source0: http://dl.sourceforge.net/junit/%{srcname}-%{version}-src.jar
# Source0-md5: 4126a0974473f7cb7df7fd5cd109505d
-Source1: http://carme.pld-linux.org/~glen/junit-%{version}.jar
-# Source1-md5: 823d46f50018f26fd4d4d7ee47fd4a6e
URL: http://www.junit.org/
-%if %{without binary}
%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
+%{!?with_java_sun:BuildRequires: gcc-java >= 6:4.4.0}
%{?with_java_sun:BuildRequires: java-sun >= 1.5}
-%endif
BuildRequires: java-hamcrest
+BuildRequires: java-qdox
BuildRequires: jpackage-utils
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
BuildRequires: unzip
Requires: java-hamcrest
+Requires: java-qdox
Provides: junit
Obsoletes: junit
BuildArch: noarch
@@ -76,21 +61,15 @@
%setup -qc
install -d javadoc
rm -f junit/runner/Version.java.template
-%if %{with binary}
-cp %{SOURCE1} .
-%endif
%build
-%if %{without binary}
-required_jars="hamcrest-core"
+required_jars="hamcrest-core qdox"
CLASSPATH=$(build-classpath $required_jars)
-export CLASSPATH
-%javac -target 1.5 -source 1.5 $(find -name '*.java')
+%javac -cp $CLASSPATH -target 1.5 -source 1.5 $(find -name '*.java')
%jar -cvf %{srcname}-%{version}.jar $(find -type f '!' -name '*.java')
-%endif
-%{?with_javadoc:%javadoc -d javadoc $(find -name '*.java')}
+%{?with_javadoc:%javadoc -classpath $CLASSPATH -d javadoc $(find -name
'*.java')}
%install
rm -rf $RPM_BUILD_ROOT
@@ -128,6 +107,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.33 2009/08/20 10:52:09 pawelz
+- now it builds with both jdks, so droped prebuilt version
+- BR: java-qdox
+- if with gcj, BR gcc-java >= 6:4.4.0 (needs full java 5)
+- fixed generation of javadoc with java_sun
+- rel 4
+
Revision 1.32 2009/05/21 18:34:59 glen
- build with java-sun, fallback to prebuilt one of no java-sun; rel 3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-junit/java-junit.spec?r1=1.32&r2=1.33&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
