pool/hamcrest
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 522232 from Java:packages

Browse Source 
Fix build with java 9

OBS-URL: https://build.opensuse.org/request/show/522232
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hamcrest?expand=0&rev=21
This commit is contained in:
Dominique Leuenberger 2017-09-13 20:19:49 +00:00 committed by Git OBS Bridge
commit 2879171cf2
4 changed files with 1161 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hamcrest-1.3-fork-javac.patch
View File

@ -16,7 +16,7 @@ Index: hamcrest-1.3/build.xml
</manifest> </manifest>
<mkdir dir="build/temp/@{modulename}-${version}.jar.contents"/> <mkdir dir="build/temp/@{modulename}-${version}.jar.contents"/>
- <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.5" includeantruntime="false"> - <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.5" includeantruntime="false">
+ <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.5" includeantruntime="false" fork="true"> + <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.6" includeantruntime="false" fork="true">
<classpath> <classpath>
<fileset dir="lib/integration"> <fileset dir="lib/integration">
<include name="*.jar"/> <include name="*.jar"/>

1144
hamcrest-1.3-javadoc9.patch Normal file
View File

File diff suppressed because it is too large Load Diff

13
hamcrest.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Sep 8 06:05:24 UTC 2017 - fstrba@suse.com
- Modified patch:
* hamcrest-1.3-fork-javac.patch
+ Specify java target level 1.6 in order to allow building
with jdk9
- Specify java source level 1.6 in order to allow building with
jdk9
- Added patch:
* hamcrest-1.3-javadoc9.patch
+ fix javadoc errors that are fatal in jdk9
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 29 16:05:25 UTC 2017 - tchvatal@suse.com Mon May 29 16:05:25 UTC 2017 - tchvatal@suse.com

4
hamcrest.spec
View File

@ -49,6 +49,7 @@ Patch3: %{name}-%{version}-javadoc.patch
#PATCH-FIX-UPSTREAM: random build crash fix #PATCH-FIX-UPSTREAM: random build crash fix
Patch4: hamcrest-1.3-random-build-crash.patch Patch4: hamcrest-1.3-random-build-crash.patch
Patch5: hamcrest-1.3-fork-javac.patch Patch5: hamcrest-1.3-fork-javac.patch
Patch6: hamcrest-1.3-javadoc9.patch
BuildRequires: ant >= 1.6.5 BuildRequires: ant >= 1.6.5
BuildRequires: java-devel >= 1.6.0 BuildRequires: java-devel >= 1.6.0
BuildRequires: javapackages-local BuildRequires: javapackages-local
@ -96,12 +97,13 @@ ln -sf $(build-classpath qdox) lib/generator/
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1
perl -pi -e 's/\r$//g' LICENSE.txt perl -pi -e 's/\r$//g' LICENSE.txt
%build %build
export CLASSPATH=$(build-classpath qdox) export CLASSPATH=$(build-classpath qdox)
ant -Dant.build.javac.source=1.5 -Dversion=%{version} -Dbuild.sysclasspath=last clean core generator library bigjar javadoc ant -Dant.build.javac.source=1.6 -Dversion=%{version} -Dbuild.sysclasspath=last clean core generator library bigjar javadoc
# inject OSGi manifests # inject OSGi manifests
mkdir -p META-INF mkdir -p META-INF