!5 Fix accidental build fail in make multithreading

Merge pull request !5 from ultra_planet/openEuler-20.09

fix-for-cargo-test-sometimes-fails-when-make-runs-with-several-simultaneous-jobs.patch

@@ -0,0 +1,27 @@
+From afc37ddad5bf09c6e8acd76242f471b491c62e9e Mon Sep 17 00:00:00 2001
+From: lherschi <lhersch@dssgmbh.de>
+Date: Sat, 25 Jul 2020 12:06:43 +0200
+Subject: [PATCH] fix for cargo test sometimes fails when make runs with
+ several simultaneous jobs
+
+---
+ Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 3f73cff73..1112bf49f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -956,10 +956,10 @@ if ENABLE_NATIVE_LAUNCHERS
+ # there is curently harecoded sh, so it can somehow basically work
+ # see the DESKTOP_SUFFIX for final tuning
+ launcher.build/$(javaws) launcher.build/$(itweb_settings) launcher.build/$(policyeditor): rust-launcher/src/main.rs rust-launcher/Cargo.toml
+-	export ITW_TMP_REPLACEMENT=$(TESTS_DIR)/rust_tests_tmp ; \
+-	mkdir -p $$ITW_TMP_REPLACEMENT; \
+ 	filename=`basename $@` ; \
+ 	type=$${filename%.*} ; \
++	export ITW_TMP_REPLACEMENT=$(TESTS_DIR)/rust_tests_tmp/$$type ; \
++	mkdir -p $$ITW_TMP_REPLACEMENT; \
+ 	srcs=$(TOP_SRC_DIR)/rust-launcher ; \
+ 	outs=$(TOP_BUILD_DIR)/launcher.in.$$type  ; \
+ 	mkdir -p launcher.build  ; \

icedtea-web.spec

@@ -10,7 +10,7 @@
 %global debug_package  %{nil}
 Name:                icedtea-web
 Version:             1.8
-Release:             3
+Release:             4
 Summary:	     Free Software web browser plugin running Java applets
 License:             LGPLv2+ and GPLv2 with exceptions
 URL:                 http://icedtea.classpath.org/wiki/IcedTea-Web
@@ -23,6 +23,7 @@ Patch0004:           PreventiveleQueue.patch
 Patch0011:           CVE-2019-10181-bin.patch
 Patch0033:           CVE-2019-10185-bin.patch
 Patch0005:           testTuning.patch
+Patch0006:           fix-for-cargo-test-sometimes-fails-when-make-runs-with-several-simultaneous-jobs.patch
 
 BuildRequires:       javapackages-tools javapackages-local %{preffered_java}-devel
 BuildRequires:       desktop-file-utils glib2-devel autoconf automake 	cargo junit hamcrest
@@ -171,6 +172,9 @@ exit 0
 %{_datadir}/man/man1/*
 
 %changelog
+* Tue Aug 25 2020 lingsheng <lingsheng@huawei.com> - 1.8-4
+- Fix accidental build fail in make multithreading
+
 * Mon Jun 8 2020 yaokai13 <yaokai13@huawei.com> - 1.8-3
 - Update to 1.8.3