Include the java-1.8.0-openjdk-portable.spec file with instructions on how to rebuild.

Remove duplicate use of README.md inside the *-src package (it is no longer about sources)

- Related: RHEL-12211

README.md

@@ -1,8 +1,34 @@
-Package of LTS OpenJDK 8
+OpenJDK 8 is a Long-Term Support (LTS) release of the Java platform.
-OpenJDK have release cadence of 6 months. but 3/4 of them are Short Term Supported for 6 months only. This package is designed to harbore them. Currently it is build on openJDK 10. LTSs (next is 11) will go as separate packages. 
 
-JDK8 is last LTS release of Java platform. It is bringing many cool improvements - http://openjdk.java.net/projects/jdk/8/ and is landing to your RHEL. Where it will be maintained for several years. You will always be allowed to install Used LTSs in build root, and alongside via alternatives. 
+For a list of major changes in OpenJDK 8 (java-1.8.0-openjdk), see the
+upstream release page: https://openjdk.org/projects/jdk8/features
 
-See announcement: http://mail.openjdk.java.net/pipermail/discuss/2017-September/004281.html
+# Rebuilding the OpenJDK package
-See java SIG plans: https://jvanek.fedorapeople.org/devconf/2018/changesInjavaReleaseProcess.pdf
 
+The OpenJDK packages are now created from a single build which is then
+packaged for different major versions of Red Hat Enterprise Linux
+(RHEL). This allows the OpenJDK team to focus their efforts on the
+development and testing of this single build, rather than having
+multiple builds which only differ by the platform they were built on.
+
+This does make rebuilding the package slightly more complicated than a
+normal package. Modifications should be made to the
+`java-1.8.0-openjdk-portable.specfile` file, which can be found with
+this README file in the source RPM or installed in the documentation
+tree by the `java-1.8.0-openjdk-headless` RPM.
+
+Once the modified `java-1.8.0-openjdk-portable` RPMs are built, they
+should be installed and will produce a number of tarballs in the
+`/usr/lib/jvm` directory. The `java-1.8.0-openjdk` RPMs can then be
+built, which will use these tarballs to create the usual RPMs found in
+RHEL. The `java-1.8.0-openjdk-portable` RPMs can be uninstalled once
+the desired final RPMs are produced.
+
+Note that the `java-1.8.0-openjdk.spec` file has a hard requirement on
+the exact version of java-1.8.0-openjdk-portable to use, so this will
+need to be modified if the version or rpmrelease values are changed in
+`java-1.8.0-openjdk-portable.specfile`.
+
+To reduce the number of RPMs involved, the `fastdebug` and `slowdebug`
+builds may be disabled using `--without fastdebug` and `--without
+slowdebug`.

java-1.8.0-openjdk.spec

@@ -339,7 +339,7 @@
 %global updatever       %(VERSION=%{whole_update}; echo ${VERSION##*u})
 # eg jdk8u60-b27 -> b27
 %global buildver        %(VERSION=%{version_tag}; echo ${VERSION##*-})
-%global rpmrelease      3
+%global rpmrelease      4
 # Settings used by the portable build
 %global portablerelease 2
 %global portablesuffix el8
@@ -801,6 +801,8 @@ exit 0
 %license %{_jvmdir}/%{jredir -- %{?1}}/LICENSE
 %license %{_jvmdir}/%{jredir -- %{?1}}/THIRD_PARTY_README
 %doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/NEWS
+%doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/README.md
+%doc %{_defaultdocdir}/%{uniquejavadocdir -- %{?1}}/java-1.%{majorver}.0-openjdk-portable.specfile
 %dir %{_jvmdir}/%{sdkdir -- %{?1}}
 %{_jvmdir}/%{jrelnk -- %{?1}}
 %dir %{_jvmdir}/%{jredir -- %{?1}}/lib/security
@@ -1080,7 +1082,6 @@ exit 0
 
 %define files_src() %{expand:
 %defattr(-,root,root,-)
-%doc README.md
 %{_jvmdir}/%{sdkdir -- %{?1}}/src.zip
 }
 
@@ -1296,9 +1297,6 @@ URL:      http://openjdk.java.net/
 # where the source is obtained from http://hg.openjdk.java.net/%%{project}/%%{repo}
 Source0: %{shenandoah_project}-%{shenandoah_repo}-%{shenandoah_revision}-4curve.tar.xz
 
-# Custom README for -src subpackage
-Source2:  README.md
-
 # Use 'icedtea_sync.sh' to update the following
 # They are based on code contained in the IcedTea project (3.x).
 # Systemtap tapsets. Zipped up to keep it small.
@@ -1332,12 +1330,16 @@ Source17: nss.fips.cfg.in
 # Ensure translations are available for new timezones
 Source18: TestTranslations.java
 
-Source20: repackReproduciblePolycies.sh
+Source21: repackReproduciblePolycies.sh
 
 # New versions of config files with aarch64 support. This is not upstream yet.
 Source100: config.guess
 Source101: config.sub
 
+# Include portable spec and instructions on how to rebuild
+Source19: README.md
+Source20: java-1.%{majorver}.0-openjdk-portable.specfile
+
 # Setup variables to reference correct sources
 %global releasezip %{_jvmdir}/%{name}-portable-%{version}-%{portablerelease}.portable.unstripped.jdk.%{_arch}.tar.xz
 %global docszip %{_jvmdir}/%{name}-portable-%{version}-%{portablerelease}.portable.docs.%{_arch}.tar.xz
@@ -1851,8 +1853,6 @@ fi
 # For old patches
 ln -s %{top_level_dir_name} jdk8
 
-cp %{SOURCE2} .
-
 # replace outdated configure guess script
 #
 # the configure macro will do this too, but it also passes a few flags not
@@ -2174,10 +2174,11 @@ for suffix in %{build_loop} ; do
   docdir=$(pwd)/%{installoutputdir -- "-docs"}
   miscdir=%{installoutputdir -- "-misc"}
 
-  # Install release notes
+  # Install release notes and rebuild instructions
   commondocdir=${RPM_BUILD_ROOT}%{_defaultdocdir}/%{uniquejavadocdir -- $suffix}
   install -d -m 755 ${commondocdir}
   mv ${jdk_image}/NEWS ${commondocdir}
+  cp -a %{SOURCE19} %{SOURCE20} ${commondocdir}
 
   # Install the jdk
   pushd ${jdk_image}
@@ -2305,7 +2306,7 @@ find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/demo \
   popd
 
 
-bash %{SOURCE20} $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix} %{javaver}
+bash %{SOURCE21} $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix} %{javaver}
 # https://bugzilla.redhat.com/show_bug.cgi?id=1183793
 touch -t 201401010000 $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/lib/security/java.security
 
@@ -2556,6 +2557,11 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Thu Apr 27 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.372.b07-4
+- Include the java-1.8.0-openjdk-portable.spec file with instructions on how to rebuild.
+- Remove duplicate use of README.md inside the *-src package (it is no longer about sources)
+- Related: RHEL-12211
+
 * Thu Apr 27 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.372.b07-3
 - Revert "Restore native build for x86 as there is no portable build"
 - Retain portable_build-arches with x86-32 added for reference