Accepting request 523033 from Java:packages
Fix build with java 9 OBS-URL: https://build.opensuse.org/request/show/523033 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/junit?expand=0&rev=20
This commit is contained in:
13
junit-jdk9.patch
Normal file
13
junit-jdk9.patch
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
--- junit-r4.11/build.xml 2012-11-13 21:10:09.000000000 +0100
|
||||||
|
+++ junit-r4.11/build.xml 2017-09-08 10:38:22.639250431 +0200
|
||||||
|
@@ -71,8 +71,8 @@
|
||||||
|
debug="on"
|
||||||
|
classpath="@{classpath}"
|
||||||
|
includeantruntime="false"
|
||||||
|
- source="1.5"
|
||||||
|
- target="1.5"
|
||||||
|
+ source="1.6"
|
||||||
|
+ target="1.6"
|
||||||
|
>
|
||||||
|
<compilerarg value="-Xlint:unchecked" />
|
||||||
|
</javac>
|
@@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Sep 8 08:42:24 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
- Added patch:
|
||||||
|
* junit-jdk9.patch
|
||||||
|
+ Build with java source and target levels 1.6 in order to
|
||||||
|
allow building with jdk9
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 19 10:03:43 UTC 2017 - dziolkowski@suse.com
|
Fri May 19 10:03:43 UTC 2017 - dziolkowski@suse.com
|
||||||
|
|
||||||
|
@@ -30,6 +30,7 @@ Source1: junit-4.11.pom
|
|||||||
Patch0: junit-no-hamcrest-src.patch
|
Patch0: junit-no-hamcrest-src.patch
|
||||||
#PATCH-FIX-UPSTREAM: build with jdk8 and newer, already in upstream repo
|
#PATCH-FIX-UPSTREAM: build with jdk8 and newer, already in upstream repo
|
||||||
Patch1: junit-jdk8.patch
|
Patch1: junit-jdk8.patch
|
||||||
|
Patch2: junit-jdk9.patch
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: hamcrest >= 1.3
|
BuildRequires: hamcrest >= 1.3
|
||||||
BuildRequires: java-devel >= 1.6.0
|
BuildRequires: java-devel >= 1.6.0
|
||||||
@@ -83,12 +84,14 @@ Demos for %{name}.
|
|||||||
%setup -q -n junit-r%{version}
|
%setup -q -n junit-r%{version}
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
find . -type f -name "*.jar" -or -name "*.class" | xargs -t rm -rf
|
find . -type f -name "*.jar" -or -name "*.class" | xargs -t rm -rf
|
||||||
|
|
||||||
ln -s $(build-classpath hamcrest/core) lib/hamcrest-core-1.3.jar
|
ln -s $(build-classpath hamcrest/core) lib/hamcrest-core-1.3.jar
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
export CLASSPATH=$(build-classpath hamcrest/core)
|
||||||
ant dist -Dversion-status=
|
ant dist -Dversion-status=
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
Reference in New Issue
Block a user