From 44b0152bc4aab672f4072e2aa266a1c4c8dbb297 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@redhat.com>
Date: May 04 2018 12:20:08 +0000
Subject: Remove duplicate patch: rhbz_1538767_fix_linking2.patch


---

diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index a49d5c2..52ca7c1 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -927,7 +927,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%{?1}
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 4.%{buildver}%{?dist}
+Release: 5.%{buildver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -1037,7 +1037,7 @@ Patch523: pr2974-rh1337583.patch
 Patch528: pr3083-rh1346460.patch
 # 8196516, RH1538767: libfontmanager.so needs to be built with LDFLAGS so as to allow
 #                     linking with unresolved symbols.
-Patch529: rhbz_1538767_fix_linking2.patch
+Patch529: rhbz_1538767_fix_linking.patch
 
 # Upstreamable debugging patches
 # Patches 204 and 205 stop the build adding .gnu_debuglink sections to unstripped files
@@ -2134,6 +2134,10 @@ require "copy_jdk_configs.lua"
 %endif
 
 %changelog
+* Fri May 04 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:1.8.0.171-5.b10
+- Remove duplicate patch rhbz_1538767_fix_linking2.patch. Just use
+  rhbz_1538767_fix_linking.patch.
+
 * Wed Apr 25 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:1.8.0.171-4.b10
 - Enable hardened build unconditionally (also for Zero).
   Resolves RHBZ#1290936.
diff --git a/rhbz_1538767_fix_linking2.patch b/rhbz_1538767_fix_linking2.patch
deleted file mode 100644
index 42032aa..0000000
--- a/rhbz_1538767_fix_linking2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# HG changeset patch
-# User sgehwolf
-# Date 1523360781 -7200
-#      Tue Apr 10 13:46:21 2018 +0200
-# Node ID 5f2401aef9acb6998f06cb82fdd8a84eda3e63ad
-# Parent  656ab3b39178c1e4de644d490613bfd8212ae924
-8196516: libfontmanager must be built with LDFLAGS allowing unresolved symbols
-Summary: Fixes build failures on some sustems with custom LDFLAGS settings.
-
-diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
---- a/make/lib/Awt2dLibraries.gmk
-+++ b/make/lib/Awt2dLibraries.gmk
-@@ -927,6 +927,10 @@ ifeq ($(OPENJDK_TARGET_OS), linux)
-   BUILD_LIBFONTMANAGER_IndicRearrangementProcessor2.cpp_CXXFLAGS := -fno-strict-overflow
- endif
- 
-+# LDFLAGS clarification:
-+#   Filter relevant linker flags disallowing unresolved symbols as we cannot
-+#   build-time decide to which library to link against (libawt_headless or
-+#   libawt_xawt). See JDK-8196516 for details.
- $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \
-     LIBRARY := fontmanager, \
-     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-@@ -941,7 +945,8 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \
-     CFLAGS_windows = -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
-         -DCC_NOEX, \
-     MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \
--    LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
-+    LDFLAGS := $(subst -Xlinker -z -Xlinker defs,, \
-+        $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK) \
-         $(call SET_SHARED_LIBRARY_ORIGIN), \
-     LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \
-     LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
-