diff --git a/hamcrest-1.3-javadoc.patch b/hamcrest-1.3-javadoc.patch index fa8b39b..2d387ef 100644 --- a/hamcrest-1.3-javadoc.patch +++ b/hamcrest-1.3-javadoc.patch @@ -18,11 +18,3 @@ Index: hamcrest-1.3/build.xml - -+ - - - diff --git a/hamcrest-1.3-no-doclint.patch b/hamcrest-1.3-no-doclint.patch deleted file mode 100644 index b12798e..0000000 --- a/hamcrest-1.3-no-doclint.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: hamcrest-1.3/build.xml -=================================================================== ---- hamcrest-1.3.orig/build.xml -+++ hamcrest-1.3/build.xml -@@ -304,6 +304,7 @@ - - - -+ - - - diff --git a/hamcrest.changes b/hamcrest.changes index 72b477b..488c207 100644 --- a/hamcrest.changes +++ b/hamcrest.changes @@ -1,11 +1,3 @@ -------------------------------------------------------------------- -Fri Jun 3 08:04:27 UTC 2016 - fstrba@suse.com - -- 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 diff --git a/hamcrest.spec b/hamcrest.spec index d7698a3..e464ad3 100644 --- a/hamcrest.spec +++ b/hamcrest.spec @@ -1,7 +1,7 @@ # # spec file for package hamcrest # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -69,8 +69,6 @@ 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 @@ -166,9 +164,6 @@ 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