diff --git a/86856b2e3d18.tar.bz2 b/86856b2e3d18.tar.bz2 deleted file mode 100644 index 24d01b7..0000000 --- a/86856b2e3d18.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f77b58637ecb5f7460c1e9b5ef3b951209dce7f75b2555b6b1b805d851430e3 -size 1555314 diff --git a/icedtea-sound-1.0.1.tar.xz b/icedtea-sound-1.0.1.tar.xz new file mode 100644 index 0000000..8854fbc --- /dev/null +++ b/icedtea-sound-1.0.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ff852b82ae7db7a95981271037eb3a3d52c59581e3b27a638a7c6bc8eecb4a3 +size 1515308 diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec index b92528e..83fc117 100644 --- a/java-1_8_0-openjdk.spec +++ b/java-1_8_0-openjdk.spec @@ -43,7 +43,7 @@ %global aarch64_project aarch64-port %global aarch64_repository jdk8 %global aarch64_hotspot_revision c5b8254a0fe2 -%global icedtea_sound_revision 86856b2e3d18 +%global icedtea_sound_version 1.0.1 # priority must be 6 digits in total %global priority 180%{updatever} %global javaver 1.8.0 @@ -154,7 +154,7 @@ Source7: http://hg.openjdk.java.net/%{root_project}/%{root_repository}/na # Hotspot version from aarch64-port repository (using the _tip_ of the http://hg.openjdk.java.net/%{aarch64_project}/%{aarch64_repository}/hotspot) Source8: http://hg.openjdk.java.net/%{aarch64_project}/%{aarch64_repository}/hotspot/archive/%{aarch64_hotspot_revision}.tar.bz2 # Pulseaudio plugin -Source9: http://icedtea.classpath.org/hg/icedtea-sound/archive/%{icedtea_sound_revision}.tar.bz2 +Source9: http://icedtea.classpath.org/download/source/icedtea-sound-%{icedtea_sound_version}.tar.xz # Systemtap tapsets. Zipped up to keep it small. Source10: systemtap-tapset.tar.gz # Desktop files. Adapated from IcedTea. @@ -222,11 +222,6 @@ BuildRequires: freetype-devel BuildRequires: gcc-c++ BuildRequires: giflib-devel BuildRequires: gtk2-devel -%if %{bootcycle} -BuildRequires: java-devel >= 1.6.0 -%else -BuildRequires: java-devel >= %{javaver} -%endif BuildRequires: libX11-devel BuildRequires: libXi-devel BuildRequires: libXinerama-devel @@ -262,6 +257,11 @@ Provides: jre-openjdk = %{version}-%{release} Provides: java-fonts = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %{!?aarch64:%global aarch64 aarch64 arm64 armv8} +%if %{bootcycle} +BuildRequires: java-devel >= 1.6.0 +%else +BuildRequires: java-devel >= %{javaver} +%endif # Zero-assembler build requirement. %ifnarch %{jit_arches} BuildRequires: libffi-devel @@ -423,7 +423,7 @@ mv jdk-%{jdk_revision} jdk mv langtools-%{langtools_revision} langtools mv nashorn-%{nashorn_revision} nashorn %if %{with_pulseaudio} -mv icedtea-sound-%{icedtea_sound_revision} icedtea-sound +mv icedtea-sound-%{icedtea_sound_version} icedtea-sound %endif # replace outdated configure guess script @@ -599,7 +599,6 @@ done %if %{with_pulseaudio} # Build the pulseaudio plugin pushd icedtea-sound -./autogen.sh %configure \ --with-jdk-home=$JAVA_HOME \ --disable-docs