Sync with f21

This commit is contained in:
Jiri Vanek 2014-07-17 16:42:32 +02:00
parent 9ba92118ec
commit f61c74f958
3 changed files with 13 additions and 9 deletions

1
.gitignore vendored
View File

@ -24,3 +24,4 @@
/aarch64-port-jdk8-b128-aarch64-992.tar.xz /aarch64-port-jdk8-b128-aarch64-992.tar.xz
/jdk8u-jdk8u5-b13.tar.xz /jdk8u-jdk8u5-b13.tar.xz
/jdk8u-jdk8u11-b12.tar.xz /jdk8u-jdk8u11-b12.tar.xz
/aarch64-hotspot-jdk8-b128-aarch64-992.tar.xz

View File

@ -135,7 +135,7 @@
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever} Version: %{javaver}.%{updatever}
Release: 4.%{buildver}%{?dist} Release: 5.%{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
@ -156,7 +156,7 @@ URL: http://openjdk.java.net/
# ./generate_source_tarball.sh jdk8u jdk8u jdk8u%{updatever}-%{buildver} # ./generate_source_tarball.sh jdk8u jdk8u jdk8u%{updatever}-%{buildver}
# ./generate_source_tarball.sh aarch64-port jdk8 %{aarch64_hg_tag} # ./generate_source_tarball.sh aarch64-port jdk8 %{aarch64_hg_tag}
Source0: jdk8u-jdk8u%{updatever}-%{buildver}.tar.xz Source0: jdk8u-jdk8u%{updatever}-%{buildver}.tar.xz
Source1: aarch64-port-jdk8-%{aarch64_buildver}-aarch64-%{aarch64_hg_tag}.tar.xz Source1: aarch64-hotspot-jdk8-%{aarch64_buildver}-aarch64-%{aarch64_hg_tag}.tar.xz
# Custom README for -src subpackage # Custom README for -src subpackage
Source2: README.src Source2: README.src
@ -267,7 +267,7 @@ BuildRequires: libffi-devel
BuildRequires: openssl BuildRequires: openssl
# execstack build requirement. # execstack build requirement.
# no prelink on ARM yet # no prelink on ARM yet
%ifnarch %{arm} %{aarch64} ppc64le %ifnarch %{arm} %{aarch64} %{ppc64le}
BuildRequires: prelink BuildRequires: prelink
%endif %endif
%if %{with_systemtap} %if %{with_systemtap}
@ -432,13 +432,13 @@ need to.
%prep %prep
%setup -q -c -n %{name} -T -a 0
%ifarch %{aarch64} %ifarch %{aarch64}
%global source_num 1 pushd jdk8
%else rm -r hotspot
%global source_num 0 tar xf %{SOURCE1}
popd
%endif %endif
%setup -q -c -n %{name} -T -a %{source_num}
cp %{SOURCE2} . cp %{SOURCE2} .
# replace outdated configure guess script # replace outdated configure guess script
@ -1156,6 +1156,9 @@ exit 0
%{_jvmdir}/%{jredir}/lib/accessibility.properties %{_jvmdir}/%{jredir}/lib/accessibility.properties
%changelog %changelog
* Tue Jul 15 2014 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.11-5.b12
- Attempt to update aarch64 *jdk* to u11b12, by resticting aarch64 sources to hotpot only
* Tue Jul 15 2014 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.11-1.b12 * Tue Jul 15 2014 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.11-1.b12
- updated to security u11b12 - updated to security u11b12

View File

@ -1,3 +1,3 @@
84eed2615ebcf518ad92c88c280ede9e jdk8u-jdk8u11-b12.tar.xz 84eed2615ebcf518ad92c88c280ede9e jdk8u-jdk8u11-b12.tar.xz
94ca5a45c3cb3b85c4577d0891166007 systemtap-tapset.tar.gz 94ca5a45c3cb3b85c4577d0891166007 systemtap-tapset.tar.gz
944bc1bc5b3a23ab7748bcf3230f5afc aarch64-port-jdk8-b128-aarch64-992.tar.xz 8c0436da8098f15c7bda2fa4f927e525 aarch64-hotspot-jdk8-b128-aarch64-992.tar.xz