- 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
This commit is contained in:
Tomáš Chvátal 2017-05-29 16:03:59 +00:00 committed by Git OBS Bridge
parent 978f5b5572
commit 569e43d086
3 changed files with 30 additions and 0 deletions

View File

@ -0,0 +1,22 @@
From 54b7ccdd1e16f1d6dd07359eae0fcac8f1883373 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
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 @@
<attribute name="Built-Date" value="${build.timestamp}"/>
</manifest>
<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" fork="true">
<classpath>
<fileset dir="lib/integration">
<include name="*.jar"/>

View File

@ -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 Fri May 19 13:11:37 UTC 2017 - tchvatal@suse.com

View File

@ -48,6 +48,7 @@ Patch2: %{name}-%{version}-no-integration.patch
Patch3: %{name}-%{version}-javadoc.patch 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
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
@ -94,6 +95,7 @@ ln -sf $(build-classpath qdox) lib/generator/
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1
perl -pi -e 's/\r$//g' LICENSE.txt perl -pi -e 's/\r$//g' LICENSE.txt