From 8d32f76d2fdb8705ad6e81fe60efae6a2239856f Mon Sep 17 00:00:00 2001 From: Jiri Date: May 01 2024 18:44:15 +0000 Subject: Added repack.info with information about original portables --- diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 06e4c60..5aa9493 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -402,6 +402,7 @@ %global alt_java_name alt-java %global rpm_state_dir %{_localstatedir}/lib/rpm-state/ +%global repack_file repack.info # For flatpack builds hard-code dependency paths, # otherwise use relative paths. @@ -1005,6 +1006,7 @@ exit 0 %ghost %{_bindir}/unpack200 %endif %endif +%{_jvmdir}/%{sdkdir -- %{?1}}/%{repack_file} } %define files_devel() %{expand: @@ -1836,6 +1838,31 @@ tar -xf %{portablejvmdir}/%{compatiblename}*%{version}*portable.slowdebug.jdk.%{ # OpenJDK patches +# print out info abot binaries used for repack. The version-less fallbacks are for development only, where can be cheated environment +echo "Those RPMs are just repacking portable tarballs extracted from portable RPMs" > %{repack_file} +echo "Usually this exact portable RPM can not be obtained via dnf install, but you can download it." >> %{repack_file} +echo "The exact info is at bottom." >> %{repack_file} +echo "All java- names and versions:" >> %{repack_file} +ls -l %{_jvmdir} >> %{repack_file} +rpm -qa | grep "java-" >> %{repack_file} +echo "Used %{compatiblename}.*portable:" >> %{repack_file} +ls -l %{_jvmdir} | grep "%{compatiblename}.*portable" >> %{repack_file} || echo "Not found!" >> %{repack_file} +echo "Used %{name}.*portable:" >> %{repack_file} +rpm -qa | grep "%{name}.*portable" >> %{repack_file} || echo "Not found!" >> %{repack_file} +echo "Used %{version}.*portable:" >> %{repack_file} +ls -l %{_jvmdir} | grep "%{version}.*portable" >> %{repack_file} || echo "Not found!" >> %{repack_file} +echo "Used portable.*%{version}:" >> %{repack_file} +rpm -qa | grep "portable.*%{version}" >> %{repack_file} || echo "Not found!" >> %{repack_file} +echo "Where this is %{fullversion}" >> %{repack_file} +portableNvr=`rpm -qa | grep %{name}-portable-misc-%{version} | sed "s/-misc-/-/" | sed "s/.%{_arch}.*//"` +if [ "x${portableNvr}" == x ] ; then + portableNvr=`rpm -qa | grep %{name}-portable-misc- | sed "s/-misc-/-/" | sed "s/.%{_arch}.*//"`" #incorrect!" +fi +echo "Which repacked ${portableNvr}" >> %{repack_file} +echo "You can download the repacked portables from:" >> %{repack_file} +echo "https://koji.fedoraproject.org/koji/search?match=glob&type=build&terms=${portableNvr}" >> %{repack_file} +echo "`date`" >> %{repack_file} + # Extract systemtap tapsets %if %{with_systemtap} tar --strip-components=1 -x -I xz -f %{SOURCE8} @@ -2095,6 +2122,7 @@ mkdir -p $RPM_BUILD_ROOT%{_jvmdir} cp -a ${jdk_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix} cp -a ${src_image} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/full_sources +cp %{repack_file} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/ #JDK8 specific, bianry file in sources rm -vf "$RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/full_sources/*/test/jdk/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher" #JDK8 specific, binary file in sources