From 569e43d08611f8d038208f42645650deafac11b07d6f823d91e04c4e4bc1137c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 29 May 2017 16:03:59 +0000 Subject: [PATCH] - Apply patch from fedora: * hamcrest-1.3-fork-javac.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/hamcrest?expand=0&rev=23 --- hamcrest-1.3-fork-javac.patch | 22 ++++++++++++++++++++++ hamcrest.changes | 6 ++++++ hamcrest.spec | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 hamcrest-1.3-fork-javac.patch diff --git a/hamcrest-1.3-fork-javac.patch b/hamcrest-1.3-fork-javac.patch new file mode 100644 index 0000000..9186591 --- /dev/null +++ b/hamcrest-1.3-fork-javac.patch @@ -0,0 +1,22 @@ +From 54b7ccdd1e16f1d6dd07359eae0fcac8f1883373 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Mon, 2 Jan 2017 10:31:56 +0100 +Subject: [PATCH] Fork javac + +--- + build.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: hamcrest-1.3/build.xml +=================================================================== +--- hamcrest-1.3.orig/build.xml ++++ hamcrest-1.3/build.xml +@@ -268,7 +268,7 @@ + + + +- ++ + + + diff --git a/hamcrest.changes b/hamcrest.changes index 073d2a3..c66b0ae 100644 --- a/hamcrest.changes +++ b/hamcrest.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 29 16:05:25 UTC 2017 - tchvatal@suse.com + +- Apply patch from fedora: + * hamcrest-1.3-fork-javac.patch + ------------------------------------------------------------------- Fri May 19 13:11:37 UTC 2017 - tchvatal@suse.com diff --git a/hamcrest.spec b/hamcrest.spec index 44709cf..2a334fa 100644 --- a/hamcrest.spec +++ b/hamcrest.spec @@ -48,6 +48,7 @@ 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 +Patch5: hamcrest-1.3-fork-javac.patch BuildRequires: ant >= 1.6.5 BuildRequires: java-devel >= 1.6.0 BuildRequires: javapackages-local @@ -94,6 +95,7 @@ ln -sf $(build-classpath qdox) lib/generator/ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 perl -pi -e 's/\r$//g' LICENSE.txt