From 1ae669ee38b50409dd95eb5be6c57066a0986fbd Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 27 Jun 2018 21:43:09 +0200 Subject: [PATCH] Added coments to sources generation, renamed lcms patch, --- ...ystemLcmsAndJpgFixFor-rev_f0aeede1b855.patch | 0 generate_tarballs.sh | 2 +- java-11-openjdk.spec | 17 +++++++++++++---- 3 files changed, 14 insertions(+), 5 deletions(-) rename systemLcmsAndJpgFixFor-f0aeede1b855.patch => JDK-8205616-systemLcmsAndJpgFixFor-rev_f0aeede1b855.patch (100%) diff --git a/systemLcmsAndJpgFixFor-f0aeede1b855.patch b/JDK-8205616-systemLcmsAndJpgFixFor-rev_f0aeede1b855.patch similarity index 100% rename from systemLcmsAndJpgFixFor-f0aeede1b855.patch rename to JDK-8205616-systemLcmsAndJpgFixFor-rev_f0aeede1b855.patch diff --git a/generate_tarballs.sh b/generate_tarballs.sh index 0c5930d..41ce929 100644 --- a/generate_tarballs.sh +++ b/generate_tarballs.sh @@ -11,7 +11,7 @@ pushd icedtea7-${VERSION} # desktop files #mv jconsole.desktop ../jconsole.desktop.in #mv policytool.desktop ../policytool.desktop.in -# Icons were generally cloned fromicedtea, but now are mucvh more specific +# Icons were originally cloned from icedtea, but now are muvh more specific # tapsets mv tapset/hotspot{,-1.8.0}.stp.in || exit 1 diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 4fb37da..4e2d260 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -131,7 +131,7 @@ # fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349 -%global _privatelibs libjsoundalsa[.]so.*|libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libjsig[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas_unix[.]so.*|libjava[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libunpack[.]so.*|libverify[.]so.*|libzip[.]so.*|lib[.]so\\(SUNWprivate_.* +%global _privatelibs libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libjsig[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas[.]so.*|libjava[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libunpack[.]so.*|libverify[.]so.*|libzip[.]so.* %global __provides_exclude ^(%{_privatelibs})$ %global __requires_exclude ^(%{_privatelibs})$ @@ -872,16 +872,25 @@ Group: Development/Languages License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib URL: http://openjdk.java.net/ + +# to regenerate source0 and source1(shenandaoh hotspot) run update_package.sh +# update_package.sh contains hardcoded repos, revisions, tags, and projects to regenerate the source archives +# at the end it sed specfile and sources to match those new names +# FIXME adapt the script to work better on shenandoah hotspot (After the jdk10 and removal of forest). Current source1 was done by manual delete +# FIXME: adapt the sed to new specfile and sources or drop those parts +# next update will be used to tweek those two files Source0: jdk-jdk-jdk-%{majorver}+%{buildver}.tar.xz # Shenandoah HotSpot # current name used with tip and bleading edge may be incorrect Source1: jdk-shenandoah-jdk-ac148db384ee.tar.xz +# Systemtap tapsets. Zipped up to keep it small # Use 'generate_tarballs.sh' to generate the following tarballs # They are based on code contained in the IcedTea7 project - -# Systemtap tapsets. Zipped up to keep it small +# The script have hardcoded url and revision +# FIXME discover what exactly is current systemtap from or +# FIXME current systemtap is not working, new version is necessary Source8: systemtap-tapset-3.6.0pre02.tar.xz # Desktop files. Adapted from IcedTea @@ -924,7 +933,7 @@ Patch5: RHBZ-1565658-system-nss-SunEC.patch # OpenJDK specific patches # ############################################# -Patch6: systemLcmsAndJpgFixFor-f0aeede1b855.patch +Patch6: JDK-8205616-systemLcmsAndJpgFixFor-rev_f0aeede1b855.patch BuildRequires: autoconf BuildRequires: automake