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

OBS-URL: https://build.opensuse.org/package/show/Java:packages/hamcrest?expand=0&rev=20

Browse Source
This commit is contained in:
Fridrich Strba 2016-06-03 08:06:06 +00:00 committed by Git OBS Bridge
parent c2bbbf11ca
commit e7a6c472da
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hamcrest-1.3-javadoc.patch
View File

@ -26,11 +26,3 @@ Index: hamcrest-1.3/build.xml
</javadoc>
<jar jarfile="build/hamcrest-all-${version}-javadoc.jar">
<fileset dir="build/temp/hamcrest-all-${version}-javadoc.jar.contents"/>
@@ -304,6 +304,7 @@
<fileset file="build/hamcrest-generator-${version}.jar"/>
<fileset file="build/hamcrest-integration-${version}.jar"/>
</classpath>
+ <arg value="-Xdoclint:none"/>
</javadoc>
<jar jarfile="build/@{modulename}-${version}-javadoc.jar">
<fileset dir="build/temp/@{modulename}-${version}-javadoc.jar.contents"/>

12
hamcrest-1.3-no-doclint.patch Normal file
View File

@ -0,0 +1,12 @@
Index: hamcrest-1.3/build.xml
===================================================================
--- hamcrest-1.3.orig/build.xml
+++ hamcrest-1.3/build.xml
@@ -304,6 +304,7 @@
<fileset file="build/hamcrest-generator-${version}.jar"/>
<fileset file="build/hamcrest-integration-${version}.jar"/>
</classpath>
+ <arg value="-Xdoclint:none"/>
</javadoc>
<jar jarfile="build/@{modulename}-${version}-javadoc.jar">
<fileset dir="build/temp/@{modulename}-${version}-javadoc.jar.contents"/>

8
hamcrest.changes
View File

@ -1,8 +1,10 @@
-------------------------------------------------------------------
Thu Jun 2 15:33:14 UTC 2016 - dimstar@opensuse.org
Fri Jun 3 08:04:27 UTC 2016 - fstrba@suse.com
- Update hamcrest-1.3-javadoc.patch: Fix build with recent Java 1.8
by disabling doclint.
- Added patch:
* hamcrest-1.3-no-doclint.patch:
- Fix build on systems that use recent Java 1.8 by disabling
doclint.
-------------------------------------------------------------------
Wed Mar 18 09:46:07 UTC 2015 - tchvatal@suse.com

5
hamcrest.spec
View File

@ -69,6 +69,8 @@ Patch2: %{name}-%{version}-no-integration.patch
Patch3: %{name}-%{version}-javadoc.patch
#PATCH-FIX-UPSTREAM: random build crash fix
Patch4: hamcrest-1.3-random-build-crash.patch
#PATCH-FIX-OPENSUSE: disable doclint
Patch5: hamcrest-1.3-no-doclint.patch
Requires: java >= 1.6.0
Requires: qdox
@ -164,6 +166,9 @@ ln -sf $(build-classpath testng-jdk15) lib/integration/
%endif
%patch3 -p1
%patch4 -p1
%if 0%{?suse_version} >= 1330
%patch5 -p1
%endif
perl -pi -e 's/\r$//g' LICENSE.txt