Accepting request 244683 from Java:Factory

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/244683
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-1_8_0-openjdk?expand=0&rev=2

86856b2e3d18.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6f77b58637ecb5f7460c1e9b5ef3b951209dce7f75b2555b6b1b805d851430e3
-size 1555314

icedtea-sound-1.0.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ff852b82ae7db7a95981271037eb3a3d52c59581e3b27a638a7c6bc8eecb4a3
+size 1515308

java-1_8_0-openjdk.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul 23 08:00:09 UTC 2014 - fstrba@suse.com
+
+- Use icedtea-sound-1.0.1 release tarball
+
 -------------------------------------------------------------------
 Fri Jul 18 07:21:20 UTC 2014 - fstrba@suse.com
 

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
@@ -63,6 +63,7 @@
 %global cacerts  %{_jvmdir}/%{jredir}/lib/security/cacerts
 # real file made by update-ca-certificates
 %global javacacerts %{_var}/lib/ca-certificates/java-cacerts
+%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
 %ifarch x86_64
 %global archinstall amd64
 %endif
@@ -154,7 +155,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 +223,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
@@ -261,7 +257,11 @@ Provides:       jre-openjdk = %{version}-%{release}
 # Standard JPackage extensions provides.
 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,13 +599,12 @@ done
 %if %{with_pulseaudio}
 # Build the pulseaudio plugin
 pushd icedtea-sound
-./autogen.sh
 %configure \
     --with-jdk-home=$JAVA_HOME \
     --disable-docs
 make %{?_smp_mflags}
-cp pulse-java.jar $JAVA_HOME/jre/lib/ext/
-cp pulseaudio.build/native/libpulse-java.so $JAVA_HOME/jre/lib/%{archinstall}/
+cp icedtea-sound.jar $JAVA_HOME/jre/lib/ext/
+cp build/native/libicedtea-sound.so $JAVA_HOME/jre/lib/%{archinstall}/
 echo "#Config file to enable PulseAudio support" > $JAVA_HOME/jre/lib/pulseaudio.properties
 echo "" >> $JAVA_HOME/jre/lib/pulseaudio.properties
 echo "javax.sound.sampled.Clip=org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider" >> $JAVA_HOME/jre/lib/pulseaudio.properties
@@ -753,7 +752,7 @@ find %{buildroot}%{_jvmdir}/%{jredir} -type f -o -type l \
 #see https://bugzilla.redhat.com/show_bug.cgi?id=875408
 NOT_HEADLESS=\
 "%{_jvmdir}/%{jredir}/lib/%{archinstall}/libjsoundalsa.so
-%{_jvmdir}/%{jredir}/lib/%{archinstall}/libpulse-java.so
+%{_jvmdir}/%{jredir}/lib/%{archinstall}/libicedtea-sound.so
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/libsplashscreen.so
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/libawt_xawt.so
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/libjawt.so"