From b0ff02ded7e153f342043da73febcb0123d430c6 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@redhat.com>
Date: Mon, 8 Oct 2018 15:38:27 +0200
Subject: [PATCH] Refresh JDK-8044235 from upstream 8u.

Move patch definition to 8u202 section.
---
 8044235-include-all-srcs.patch | 79 ++++++++++++++++++++++++++++------
 java-1.8.0-openjdk.spec        |  4 +-
 2 files changed, 69 insertions(+), 14 deletions(-)

diff --git a/8044235-include-all-srcs.patch b/8044235-include-all-srcs.patch
index 41b1ea2..1beda6d 100644
--- a/8044235-include-all-srcs.patch
+++ b/8044235-include-all-srcs.patch
@@ -1,9 +1,20 @@
---- jdk8/jdk/make/CreateJars.gmk
-+++ jdk8/jdk/make/CreateJars.gmk
-@@ -569,38 +569,12 @@
+# HG changeset patch
+# User omajid
+# Date 1401638044 14400
+#      Sun Jun 01 11:54:04 2014 -0400
+# Node ID fd78f7e83f3f1ce7d363b681b97583138218afcb
+# Parent  8d0af21b5b9789f97b05edacc221a63f851d13b8
+8044235: src.zip should include all sources
+Reviewed-by: andrew, dholmes
+
+diff --git a/make/CreateJars.gmk b/make/CreateJars.gmk
+--- openjdk/jdk/make/CreateJars.gmk
++++ openjdk/jdk/make/CreateJars.gmk
+@@ -584,40 +584,53 @@
+ 
  ##########################################################################################
  
- SRC_ZIP_INCLUDES = \
+-SRC_ZIP_INCLUDES = \
 -    com/sun/corba \
 -    com/sun/image/codec/jpeg \
 -    com/sun/imageio \
@@ -16,8 +27,7 @@
 -    com/sun/security/auth \
 -    com/sun/security/jgss \
 -    com/sun/source \
-+    com \
-     java \
+-    java \
 -    javax/accessibility \
 -    javax/annotation \
 -    javax/imageio \
@@ -37,18 +47,63 @@
 -    org/omg \
 -    org/w3c/dom \
 -    org/xml/sax \
-+    javax \
-+    jdk \
-+    org \
-+    sun \
-     #
+-    #
++ifdef OPENJDK
++    SRC_ZIP_INCLUDES = \
++        com \
++        java \
++        javax \
++        jdk \
++        org \
++        sun \
++        #
++    SRC_ZIP_EXCLUDES =
++else
++    SRC_ZIP_INCLUDES = \
++        com/sun/corba \
++        com/sun/image/codec/jpeg \
++        com/sun/imageio \
++        com/sun/java_cup \
++        com/sun/javadoc \
++        com/sun/java/swing \
++        com/sun/jmx \
++        com/sun/naming \
++        com/sun/org/apache \
++        com/sun/security/auth \
++        com/sun/security/jgss \
++        com/sun/source \
++        java \
++        javax/accessibility \
++        javax/annotation \
++        javax/imageio \
++        javax/lang \
++        javax/management \
++        javax/naming \
++        javax/print \
++        javax/rmi \
++        javax/script \
++        javax/security \
++        javax/sound \
++        javax/sql \
++        javax/swing \
++        javax/tools \
++        javax/xml \
++        org/ietf \
++        org/omg \
++        org/w3c/dom \
++        org/xml/sax \
++        #
++    SRC_ZIP_EXCLUDES = javax/swing/beaninfo
++endif
  
  SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
-@@ -632,7 +606,6 @@
+ SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc
+@@ -648,7 +661,7 @@
  $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
      SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \
      INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \
 -    EXCLUDES := javax/swing/beaninfo, \
++    EXCLUDES := $(SRC_ZIP_EXCLUDES), \
      SUFFIXES := .java .c .h, \
      ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
      EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 59445d0..627dde5 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -1094,8 +1094,6 @@ Patch106: pr3519.patch
 # Patches which need backporting to 8u
 #
 #############################################
-# 8044235: src.zip should include all sources
-Patch7:   8044235-include-all-srcs.patch
 # S8074839, PR2462: Resolve disabled warnings for libunpack and the unpack200 binary
 # This fixes printf warnings that lead to build failure with -Werror=format-security from optflags
 Patch502: pr2462.patch
@@ -1193,6 +1191,8 @@ Patch210: 8165852-pr3468.patch
 Patch601: 8073139-rh1191652-root.patch
 Patch602: 8073139-rh1191652-jdk.patch
 Patch603: 8073139-rh1191652-hotspot-aarch64.patch
+# 8044235: src.zip should include all sources
+Patch7:   8044235-include-all-srcs.patch
 
 #############################################
 #