From 5184e9134eeaf4b53bc16df9e514b929b6cf208e Mon Sep 17 00:00:00 2001
From: Andrew Hughes <gnu.andrew@redhat.com>
Date: Mon, 9 Aug 2021 02:09:38 +0100
Subject: [PATCH] Remove non-Free test from source tarball.

---
 .gitignore                 |  1 +
 generate_source_tarball.sh | 19 +++++++++++++++++--
 java-11-openjdk.spec       |  7 +++++--
 sources                    |  2 +-
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0552c5f..c5224a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,3 +92,4 @@
 /jdk-updates-jdk11u-jdk-11.0.12+4-4curve.tar.xz
 /jdk-updates-jdk11u-jdk-11.0.12+6-4curve.tar.xz
 /jdk-updates-jdk11u-jdk-11.0.12+7-4curve.tar.xz
+/jdk-updates-jdk11u-jdk-11.0.12+7-4curve-clean.tar.xz
diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh
index 9baaf2c..d8c729b 100755
--- a/generate_source_tarball.sh
+++ b/generate_source_tarball.sh
@@ -94,12 +94,22 @@ if [ "x$REPO_ROOT" = "x" ] ; then
     REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}"
     echo "No repository root specified; default to ${REPO_ROOT}"
 fi;
-
 if [ "x$TO_COMPRESS" = "x" ] ; then
     TO_COMPRESS="openjdk"
     echo "No to be compressed targets specified, ; default to ${TO_COMPRESS}"
 fi;
 
+echo -e "Settings:"
+echo -e "\tVERSION: ${VERSION}"
+echo -e "\tPROJECT_NAME: ${PROJECT_NAME}"
+echo -e "\tREPO_NAME: ${REPO_NAME}"
+echo -e "\tOPENJDK_URL: ${OPENJDK_URL}"
+echo -e "\tCOMPRESSION: ${COMPRESSION}"
+echo -e "\tFILE_NAME_ROOT: ${FILE_NAME_ROOT}"
+echo -e "\tREPO_ROOT: ${REPO_ROOT}"
+echo -e "\tTO_COMPRESS: ${TO_COMPRESS}"
+echo -e "\tPRTBC01: ${PRTBC01}"
+
 if [ -d ${FILE_NAME_ROOT} ] ; then
   echo "exists exists exists exists exists exists exists "
   echo "reusing reusing reusing reusing reusing reusing "
@@ -112,6 +122,11 @@ else
   popd
 fi
 pushd "${FILE_NAME_ROOT}"
+# UnderlineTaglet.java has a BSD license with a field-of-use restriction, making it non-Free
+    if [ -d openjdk/test ] ; then
+	echo "Removing langtools test case with non-Free license"
+	rm -vf openjdk/test/langtools/tools/javadoc/api/basic/taglets/UnderlineTaglet.java
+    fi
     if [ -d openjdk/src ]; then 
         pushd openjdk
             echo "Removing EC source code we don't build"
@@ -148,7 +163,7 @@ pushd "${FILE_NAME_ROOT}"
     else
         SWITCH=czf
     fi
-    TARBALL_NAME=${FILE_NAME_ROOT}-4curve.tar.${COMPRESSION}
+    TARBALL_NAME=${FILE_NAME_ROOT}-4curve-clean.tar.${COMPRESSION}
     tar --exclude-vcs -$SWITCH ${TARBALL_NAME} $TO_COMPRESS
     mv ${TARBALL_NAME} ..
 popd
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 20a9658..3c683f0 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -343,7 +343,7 @@
 %global top_level_dir_name   %{origin}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
 %global buildver        7
-%global rpmrelease      1
+%global rpmrelease      2
 #%%global tagsuffix      ""
 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
 %if %is_system_jdk
@@ -1158,7 +1158,7 @@ URL:      http://openjdk.java.net/
 
 # to regenerate source0 (jdk) run update_package.sh
 # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
-Source0: jdk-updates-jdk%{featurever}u-jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}-4curve.tar.xz
+Source0: jdk-updates-jdk%{featurever}u-jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}-4curve-clean.tar.xz
 
 # Use 'icedtea_sync.sh' to update the following
 # They are based on code contained in the IcedTea project (6.x).
@@ -2317,6 +2317,9 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Mon Aug 09 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.12.0.7-2
+- Remove non-Free test from source tarball.
+
 * Wed Jul 28 2021 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.12.0.7-1
 - Add patch in order to fix java.library.path issue on aarch64 (JDK-8269668)
 - Resolves: rhbz#1977671
diff --git a/sources b/sources
index 5132871..e12eab2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
-SHA512 (jdk-updates-jdk11u-jdk-11.0.12+7-4curve.tar.xz) = 6a4d083ed9250730f701a4de4af929017cedfdc09015b378519a4e782f9c9771fbb5686e654044b8dceee5962abbacf5af071b277b1584dc27b430f2d60fdc12
+SHA512 (jdk-updates-jdk11u-jdk-11.0.12+7-4curve-clean.tar.xz) = c7180055ef449f2218618049a55fb44ddf4d353d8b32714f092c326387d5e29b49b42e2df2802e01549b086499ade8417e8d0e1b057aa954272072a2c0669151