Include jdeps and jjs for aarch64
These are present in b128 and make aarch64 fail to build if not packagaged.
This commit is contained in:
parent
7a17734025
commit
4616e9cf28
@ -130,7 +130,7 @@
|
|||||||
|
|
||||||
Name: java-%{javaver}-%{origin}
|
Name: java-%{javaver}-%{origin}
|
||||||
Version: %{javaver}.%{updatever}
|
Version: %{javaver}.%{updatever}
|
||||||
Release: 0.33.%{buildver}%{?dist}
|
Release: 0.34.%{buildver}%{?dist}
|
||||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
|
# 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
|
# 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
|
# also included the epoch in their virtual provides. This created a
|
||||||
@ -759,9 +759,7 @@ alternatives \
|
|||||||
--install %{_bindir}/java java %{jrebindir}/java %{priority} \
|
--install %{_bindir}/java java %{jrebindir}/java %{priority} \
|
||||||
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{jrelnk} \
|
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{jrelnk} \
|
||||||
--slave %{_jvmjardir}/jre jre_exports %{_jvmjardir}/%{jrelnk} \
|
--slave %{_jvmjardir}/jre jre_exports %{_jvmjardir}/%{jrelnk} \
|
||||||
%ifnarch %{aarch64}
|
|
||||||
--slave %{_bindir}/jjs jjs %{jrebindir}/jjs \
|
--slave %{_bindir}/jjs jjs %{jrebindir}/jjs \
|
||||||
%endif
|
|
||||||
--slave %{_bindir}/keytool keytool %{jrebindir}/keytool \
|
--slave %{_bindir}/keytool keytool %{jrebindir}/keytool \
|
||||||
--slave %{_bindir}/orbd orbd %{jrebindir}/orbd \
|
--slave %{_bindir}/orbd orbd %{jrebindir}/orbd \
|
||||||
--slave %{_bindir}/pack200 pack200 %{jrebindir}/pack200 \
|
--slave %{_bindir}/pack200 pack200 %{jrebindir}/pack200 \
|
||||||
@ -772,10 +770,8 @@ alternatives \
|
|||||||
--slave %{_bindir}/unpack200 unpack200 %{jrebindir}/unpack200 \
|
--slave %{_bindir}/unpack200 unpack200 %{jrebindir}/unpack200 \
|
||||||
--slave %{_mandir}/man1/java.1$ext java.1$ext \
|
--slave %{_mandir}/man1/java.1$ext java.1$ext \
|
||||||
%{_mandir}/man1/java-%{name}.1$ext \
|
%{_mandir}/man1/java-%{name}.1$ext \
|
||||||
%ifnarch %{aarch64}
|
|
||||||
--slave %{_mandir}/man1/jjs.1$ext jjs.1$ext \
|
--slave %{_mandir}/man1/jjs.1$ext jjs.1$ext \
|
||||||
%{_mandir}/man1/jjs-%{name}.1$ext \
|
%{_mandir}/man1/jjs-%{name}.1$ext \
|
||||||
%endif
|
|
||||||
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \
|
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \
|
||||||
%{_mandir}/man1/keytool-%{name}.1$ext \
|
%{_mandir}/man1/keytool-%{name}.1$ext \
|
||||||
--slave %{_mandir}/man1/orbd.1$ext orbd.1$ext \
|
--slave %{_mandir}/man1/orbd.1$ext orbd.1$ext \
|
||||||
@ -849,9 +845,7 @@ alternatives \
|
|||||||
--slave %{_bindir}/jcmd jcmd %{sdkbindir}/jcmd \
|
--slave %{_bindir}/jcmd jcmd %{sdkbindir}/jcmd \
|
||||||
--slave %{_bindir}/jconsole jconsole %{sdkbindir}/jconsole \
|
--slave %{_bindir}/jconsole jconsole %{sdkbindir}/jconsole \
|
||||||
--slave %{_bindir}/jdb jdb %{sdkbindir}/jdb \
|
--slave %{_bindir}/jdb jdb %{sdkbindir}/jdb \
|
||||||
%ifnarch %{aarch64}
|
|
||||||
--slave %{_bindir}/jdeps jdeps %{sdkbindir}/jdeps \
|
--slave %{_bindir}/jdeps jdeps %{sdkbindir}/jdeps \
|
||||||
%endif
|
|
||||||
--slave %{_bindir}/jhat jhat %{sdkbindir}/jhat \
|
--slave %{_bindir}/jhat jhat %{sdkbindir}/jhat \
|
||||||
--slave %{_bindir}/jinfo jinfo %{sdkbindir}/jinfo \
|
--slave %{_bindir}/jinfo jinfo %{sdkbindir}/jinfo \
|
||||||
--slave %{_bindir}/jmap jmap %{sdkbindir}/jmap \
|
--slave %{_bindir}/jmap jmap %{sdkbindir}/jmap \
|
||||||
@ -893,10 +887,8 @@ alternatives \
|
|||||||
%{_mandir}/man1/jconsole-%{name}.1$ext \
|
%{_mandir}/man1/jconsole-%{name}.1$ext \
|
||||||
--slave %{_mandir}/man1/jdb.1$ext jdb.1$ext \
|
--slave %{_mandir}/man1/jdb.1$ext jdb.1$ext \
|
||||||
%{_mandir}/man1/jdb-%{name}.1$ext \
|
%{_mandir}/man1/jdb-%{name}.1$ext \
|
||||||
%ifnarch %{aarch64}
|
|
||||||
--slave %{_mandir}/man1/jdeps.1$ext jdeps.1$ext \
|
--slave %{_mandir}/man1/jdeps.1$ext jdeps.1$ext \
|
||||||
%{_mandir}/man1/jdeps-%{name}.1$ext \
|
%{_mandir}/man1/jdeps-%{name}.1$ext \
|
||||||
%endif
|
|
||||||
--slave %{_mandir}/man1/jhat.1$ext jhat.1$ext \
|
--slave %{_mandir}/man1/jhat.1$ext jhat.1$ext \
|
||||||
%{_mandir}/man1/jhat-%{name}.1$ext \
|
%{_mandir}/man1/jhat-%{name}.1$ext \
|
||||||
--slave %{_mandir}/man1/jinfo.1$ext jinfo.1$ext \
|
--slave %{_mandir}/man1/jinfo.1$ext jinfo.1$ext \
|
||||||
@ -1007,9 +999,7 @@ exit 0
|
|||||||
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
|
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
|
||||||
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/blacklisted.certs
|
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/blacklisted.certs
|
||||||
%{_mandir}/man1/java-%{name}.1*
|
%{_mandir}/man1/java-%{name}.1*
|
||||||
%ifnarch %{aarch64}
|
|
||||||
%{_mandir}/man1/jjs-%{name}.1*
|
%{_mandir}/man1/jjs-%{name}.1*
|
||||||
%endif
|
|
||||||
%{_mandir}/man1/keytool-%{name}.1*
|
%{_mandir}/man1/keytool-%{name}.1*
|
||||||
%{_mandir}/man1/orbd-%{name}.1*
|
%{_mandir}/man1/orbd-%{name}.1*
|
||||||
%{_mandir}/man1/pack200-%{name}.1*
|
%{_mandir}/man1/pack200-%{name}.1*
|
||||||
@ -1056,9 +1046,7 @@ exit 0
|
|||||||
%{_mandir}/man1/jconsole-%{name}.1*
|
%{_mandir}/man1/jconsole-%{name}.1*
|
||||||
%{_mandir}/man1/jcmd-%{name}.1*
|
%{_mandir}/man1/jcmd-%{name}.1*
|
||||||
%{_mandir}/man1/jdb-%{name}.1*
|
%{_mandir}/man1/jdb-%{name}.1*
|
||||||
%ifnarch %{aarch64}
|
|
||||||
%{_mandir}/man1/jdeps-%{name}.1*
|
%{_mandir}/man1/jdeps-%{name}.1*
|
||||||
%endif
|
|
||||||
%{_mandir}/man1/jhat-%{name}.1*
|
%{_mandir}/man1/jhat-%{name}.1*
|
||||||
%{_mandir}/man1/jinfo-%{name}.1*
|
%{_mandir}/man1/jinfo-%{name}.1*
|
||||||
%{_mandir}/man1/jmap-%{name}.1*
|
%{_mandir}/man1/jmap-%{name}.1*
|
||||||
@ -1100,6 +1088,9 @@ exit 0
|
|||||||
%{_jvmdir}/%{jredir}/lib/accessibility.properties
|
%{_jvmdir}/%{jredir}/lib/accessibility.properties
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 11 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.34.b132
|
||||||
|
- Include jdeps and jjs for aarch64. These are present in b128.
|
||||||
|
|
||||||
* Mon Mar 10 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.33.b132
|
* Mon Mar 10 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.33.b132
|
||||||
- Update aarch64 tarball to the latest upstream release
|
- Update aarch64 tarball to the latest upstream release
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user