From 0095fa0da3da2f4bb73d4515b512fd64f8668f7f Mon Sep 17 00:00:00 2001 From: Alex Kashchenko Date: Sep 21 2016 11:40:51 +0000 Subject: provides for java and javac, bootjdk change --- diff --git a/java-1.8.0-openjdk-aarch32.spec b/java-1.8.0-openjdk-aarch32.spec index 1aca9e3..7c3f352 100644 --- a/java-1.8.0-openjdk-aarch32.spec +++ b/java-1.8.0-openjdk-aarch32.spec @@ -646,15 +646,15 @@ OrderWithRequires: %{name}-headless%1 = %{epoch}:%{version}-%{release} # Standard JPackage base provides. -#Provides: jre-%{javaver}-%{origin}%1 = %{epoch}:%{version}-%{release} -#Provides: jre-%{origin}%1 = %{epoch}:%{version}-%{release} -#Provides: jre-%{javaver}%1 = %{epoch}:%{version}-%{release} -#Provides: java-%{javaver}%1 = %{epoch}:%{version}-%{release} -#Provides: jre = %{javaver}%1 -#Provides: java-%{origin}%1 = %{epoch}:%{version}-%{release} -#Provides: java%1 = %{epoch}:%{javaver} +Provides: jre-%{javaver}-%{origin}%1 = %{epoch}:%{version}-%{release} +Provides: jre-%{origin}%1 = %{epoch}:%{version}-%{release} +Provides: jre-%{javaver}%1 = %{epoch}:%{version}-%{release} +Provides: java-%{javaver}%1 = %{epoch}:%{version}-%{release} +Provides: jre = %{javaver}%1 +Provides: java-%{origin}%1 = %{epoch}:%{version}-%{release} +Provides: java%1 = %{epoch}:%{javaver} # Standard JPackage extensions provides. -#Provides: java-fonts%1 = %{epoch}:%{version} +Provides: java-fonts%1 = %{epoch}:%{version} Obsoletes: java-1.7.0-openjdk%1 Obsoletes: java-1.5.0-gcj%1 @@ -686,27 +686,27 @@ Requires(postun): %{_sbindir}/alternatives Requires(postun): chkconfig >= 1.7 # Standard JPackage base provides. -#Provides: jre-%{javaver}-%{origin}-headless%1 = %{epoch}:%{version}-%{release} -#Provides: jre-%{origin}-headless%1 = %{epoch}:%{version}-%{release} -#Provides: jre-%{javaver}-headless%1 = %{epoch}:%{version}-%{release} -#Provides: java-%{javaver}-headless%1 = %{epoch}:%{version}-%{release} -#Provides: jre-headless%1 = %{epoch}:%{javaver} -#Provides: java-%{origin}-headless%1 = %{epoch}:%{version}-%{release} -#Provides: java-headless%1 = %{epoch}:%{javaver} +Provides: jre-%{javaver}-%{origin}-headless%1 = %{epoch}:%{version}-%{release} +Provides: jre-%{origin}-headless%1 = %{epoch}:%{version}-%{release} +Provides: jre-%{javaver}-headless%1 = %{epoch}:%{version}-%{release} +Provides: java-%{javaver}-headless%1 = %{epoch}:%{version}-%{release} +Provides: jre-headless%1 = %{epoch}:%{javaver} +Provides: java-%{origin}-headless%1 = %{epoch}:%{version}-%{release} +Provides: java-headless%1 = %{epoch}:%{javaver} # Standard JPackage extensions provides. -#Provides: jndi%1 = %{epoch}:%{version} -#Provides: jndi-ldap%1 = %{epoch}:%{version} -#Provides: jndi-cos%1 = %{epoch}:%{version} -#Provides: jndi-rmi%1 = %{epoch}:%{version} -#Provides: jndi-dns%1 = %{epoch}:%{version} -#Provides: jaas%1 = %{epoch}:%{version} -#Provides: jsse%1 = %{epoch}:%{version} -#Provides: jce%1 = %{epoch}:%{version} -#Provides: jdbc-stdext%1 = 4.1 -#Provides: java-sasl%1 = %{epoch}:%{version} +Provides: jndi%1 = %{epoch}:%{version} +Provides: jndi-ldap%1 = %{epoch}:%{version} +Provides: jndi-cos%1 = %{epoch}:%{version} +Provides: jndi-rmi%1 = %{epoch}:%{version} +Provides: jndi-dns%1 = %{epoch}:%{version} +Provides: jaas%1 = %{epoch}:%{version} +Provides: jsse%1 = %{epoch}:%{version} +Provides: jce%1 = %{epoch}:%{version} +Provides: jdbc-stdext%1 = 4.1 +Provides: java-sasl%1 = %{epoch}:%{version} #https://bugzilla.redhat.com/show_bug.cgi?id=1312019 -#Provides: /usr/bin/jjs +Provides: /usr/bin/jjs Obsoletes: java-1.7.0-openjdk-headless%1 } @@ -725,13 +725,13 @@ Requires(postun): %{_sbindir}/alternatives Requires(postun): chkconfig >= 1.7 # Standard JPackage devel provides. -#Provides: java-sdk-%{javaver}-%{origin}%1 = %{epoch}:%{version} -#Provides: java-sdk-%{javaver}%1 = %{epoch}:%{version} -#Provides: java-sdk-%{origin}%1 = %{epoch}:%{version} -#Provides: java-sdk%1 = %{epoch}:%{javaver} -#Provides: java-%{javaver}-devel%1 = %{epoch}:%{version} -#Provides: java-devel-%{origin}%1 = %{epoch}:%{version} -#Provides: java-devel%1 = %{epoch}:%{javaver} +Provides: java-sdk-%{javaver}-%{origin}%1 = %{epoch}:%{version} +Provides: java-sdk-%{javaver}%1 = %{epoch}:%{version} +Provides: java-sdk-%{origin}%1 = %{epoch}:%{version} +Provides: java-sdk%1 = %{epoch}:%{javaver} +Provides: java-%{javaver}-devel%1 = %{epoch}:%{version} +Provides: java-devel-%{origin}%1 = %{epoch}:%{version} +Provides: java-devel%1 = %{epoch}:%{javaver} Obsoletes: java-1.7.0-openjdk-devel%1 Obsoletes: java-1.5.0-gcj-devel%1 @@ -757,8 +757,8 @@ Requires(postun): %{_sbindir}/alternatives Requires(postun): chkconfig >= 1.7 # Standard JPackage javadoc provides. -#Provides: java-javadoc%1 = %{epoch}:%{version}-%{release} -#Provides: java-%{javaver}-javadoc%1 = %{epoch}:%{version}-%{release} +Provides: java-javadoc%1 = %{epoch}:%{version}-%{release} +Provides: java-%{javaver}-javadoc%1 = %{epoch}:%{version}-%{release} Obsoletes: java-1.7.0-openjdk-javadoc%1 @@ -783,7 +783,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1 Name: java-%{javaver}-%{origin}-aarch32 Version: %{javaver}.%{updatever} -Release: 5.%{buildver}%{?dist} +Release: 6.%{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 @@ -954,7 +954,7 @@ BuildRequires: nss-devel BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel BuildRequires: zip -BuildRequires: java-1.8.0-openjdk-devel +BuildRequires: java-1.8.0-openjdk-aarch32-devel # Zero-assembler build requirement. %ifnarch %{jit_arches} BuildRequires: libffi-devel @@ -1342,7 +1342,7 @@ bash ../../configure \ --with-milestone="fcs" \ --with-update-version=%{updatever} \ --with-build-number=%{buildver} \ - --with-boot-jdk=/usr/lib/jvm/java-openjdk \ + --with-boot-jdk=$(echo /usr/lib/jvm/java-1.8.0-openjdk-aarch32-*) \ --with-debug-level=$debugbuild \ --enable-unlimited-crypto \ --enable-system-nss \ @@ -1841,6 +1841,11 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed Sep 21 2016 Alex Kashchenko - 1:1.8.0.102-6.160812 +- fixed macro in comments +- re-enabled openjdk-aarch32 as a boot jdk +- enabled provides for both java and javac + * Tue Sep 20 2016 Jiri Vanek - 1:1.8.0.102-5.160812 - sync with normal java packages: - added zipped javadocs @@ -1851,7 +1856,7 @@ require "copy_jdk_configs.lua" - declared check_sum_presented_in_spec and used in prep and check - it is checking that latest packed java.security is mentioned in listing - added ECDSA check -- added %{_arch} postfix to alternatives +- added %%{_arch} postfix to alternatives * Wed Aug 31 2016 Alex Kashchenko - 1:1.8.0.102-3.160812 - revert boot jdk back to zero