packages: java-junit/java-junit.spec - don't force specific jdk
pawelz
pawelz at pld-linux.org
Sun Apr 18 17:08:00 CEST 2010
Author: pawelz Date: Sun Apr 18 15:08:00 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- don't force specific jdk
---- Files affected:
packages/java-junit:
java-junit.spec (1.34 -> 1.35)
---- Diffs:
================================================================
Index: packages/java-junit/java-junit.spec
diff -u packages/java-junit/java-junit.spec:1.34 packages/java-junit/java-junit.spec:1.35
--- packages/java-junit/java-junit.spec:1.34 Sun Dec 6 13:16:15 2009
+++ packages/java-junit/java-junit.spec Sun Apr 18 17:07:51 2010
@@ -3,12 +3,6 @@
# Conditional build:
%bcond_without javadoc # don't build javadoc
-%if "%{pld_release}" == "ti"
-%bcond_without java_sun # build with gcj
-%else
-%bcond_with java_sun # build with java-sun
-%endif
-
%define srcname junit
%include /usr/lib/rpm/macros.java
Summary: JUnit - regression testing framework
@@ -18,14 +12,13 @@
Release: 1
License: IBM Common Public License v1.0
Group: Libraries/Java
-Source0: http://dl.sourceforge.net/junit/%{srcname}-%{version}-src.jar
+Source0: http://downloads.sourceforge.net/junit/%{srcname}-%{version}-src.jar
# Source0-md5: 5e1f1c4551bcd8399a1c3aeae123f575
URL: http://www.junit.org/
-%{!?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}
BuildRequires: java-hamcrest
BuildRequires: java-qdox
+BuildRequires: java-sun
+BuildRequires: jdk >= 1.5
BuildRequires: jpackage-utils
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
@@ -107,6 +100,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.35 2010/04/18 15:07:51 pawelz
+- don't force specific jdk
+
Revision 1.34 2009/12/06 12:16:15 pawelz
- up tu 4.8
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-junit/java-junit.spec?r1=1.34&r2=1.35&f=u
More information about the pld-cvs-commit
mailing list