[java-1.8.0-openjdk/f20] Include all sources in src.zip

[Omair Majid]

commit bd469ec97d6e393024986f20add4e54b5ffde299
Author: Omair Majid <omajid at redhat.com>
Date:   Fri Aug 15 17:29:02 2014 -0400

    Include all sources in src.zip
    
    Don't filter resources to include in src.zip. Include all known (sub)
    packages in the src.zip.
    
    Resolves rhbz#1130490

 include-all-srcs.patch  |  110 +++++++++++++++++++++++++++++++++++++++++++++++
 java-1.8.0-openjdk.spec |   10 ++++-
 2 files changed, 119 insertions(+), 1 deletions(-)
---
diff --git a/include-all-srcs.patch b/include-all-srcs.patch
new file mode 100644
index 0000000..0b081d4
--- /dev/null
+++ b/include-all-srcs.patch
@@ -0,0 +1,110 @@
+
+# HG changeset patch
+# User omajid
+# Date 1401638044 14400
+# Node ID 5cab03c4e5f95e43d346fbbfc0183aaeb75eca86
+# Parent  b561412cd668de3d5f604b47945acf4906d03078
+8044235: src.zip should include all sources
+Reviewed-by: andrew, dholmes
+
+diff -r b561412cd668 -r 5cab03c4e5f9 make/CreateJars.gmk
+--- jdk8/jdk/make/CreateJars.gmk	Fri May 30 16:45:30 2014 -0700
++++ jdk8/jdk/make/CreateJars.gmk	Sun Jun 01 11:54:04 2014 -0400
+@@ -552,40 +552,53 @@
+ 
+ ##########################################################################################
+ 
+-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 \
+-    #
++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
+ SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc
+@@ -616,7 +629,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 81003e8..50d3ef3 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -135,7 +135,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{updatever}
-Release: 7.%{buildver}%{?dist}
+Release: 8.%{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
@@ -222,6 +222,8 @@ Patch201: system-libjpeg.patch
 Patch202: system-libpng.patch
 Patch203: system-lcms.patch
 
+Patch210: include-all-srcs.patch
+
 Patch999:  0001-PPC64LE-arch-support-in-openjdk-1.8.patch
 Patch9999: enableArm64.patch
 
@@ -431,6 +433,8 @@ sh %{SOURCE12}
 %patch202
 %patch203
 
+%patch210
+
 
 %patch1
 %patch2
@@ -1119,6 +1123,10 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
+* Fri Aug 15 2014 Omair Majid <omajid at redhat.com> - 1:1.8.0.11-8.b12
+- Include all sources in src.zip
+- Resolves rhbz#1130490
+
 * Mon Jul 21 2014 Jiri Vanek <jvanek at redhat.com> - 1:1.8.0.11-7.b12
 - removed legacy aarch64 switches
  - --with-jvm-variants=client and  --disable-precompiled-headers