#
+# NOTE: versioning and release status might not be clear
+# http://openjdk.java.net/projects/jdk8u/ gives some information
+# about current status of the 'updates'
+#
# TODO:
-# - fix BuildRequires
-# - fix build with system giflib
# - use other system libs (libsctp?)
-# - build alternative VM for x32
# - include icedtea-sound?
-# - port PLD-specific changes from icedtea7?
+# - consider zeroshark (LLVM-based JIT) for x32
%bcond_with bootstrap # build a bootstrap version, using icedtea6
%bcond_without cacerts # don't include the default CA certificates
# JDK/JRE version, as returned with `java -version`, '_' replaced with '.'
%define _jdkversion 1.8.0.internal
-Summary: Open-source implementation of the Java Platform, Standard Edition
-Summary(pl.UTF-8): Wolnoźródłowa implementacja Java 8 SE
%define ver_u 66
%define ver_b 02
+Summary: Open-source implementation of the Java Platform, Standard Edition
+Summary(pl.UTF-8): Wolnoźródłowa implementacja Java 8 SE
Name: openjdk8
Version: 8u%{ver_u}.b%{ver_b}
-Release: 0.1
+Release: 2
License: GPL v2
Group: Development/Languages/Java
Source0: %{name}-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
Patch5: system-libpng.patch
Patch6: system-lcms.patch
Patch7: system-pcsclite.patch
-%prep
-
-%buildrequires_jdk
+Patch8: x32.patch
+Patch9: current_stack_pointer.patch
+URL: http://openjdk.java.net/
+BuildRequires: /usr/bin/jar
+BuildRequires: alsa-lib-devel
+BuildRequires: ant
+BuildRequires: autoconf
+BuildRequires: bash
+%{?with_cacerts:BuildRequires: ca-certificates-update}
+BuildRequires: cups-devel
+BuildRequires: freetype-devel >= 2.3
+BuildRequires: gawk
+BuildRequires: giflib-devel >= 5.1
+BuildRequires: glibc-misc
+%{?buildrequires_jdk}
BuildRequires: lcms2-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
Suggests: icedtea-web
Obsoletes: icedtea6
Obsoletes: icedtea7
-Obsoletes: java5-sun
-Obsoletes: java5-sun-jre
-Obsoletes: java5-sun-jre-jdbc
-Obsoletes: java5-sun-jre-X11
-Obsoletes: java5-sun-tools
Obsoletes: java-gcj-compat
Obsoletes: java-gcj-compat-devel
Obsoletes: java-sun
Obsoletes: java-sun-demos
Obsoletes: java-sun-jre
+Obsoletes: java-sun-jre-X11
Obsoletes: java-sun-jre-alsa
Obsoletes: java-sun-jre-jdbc
-Obsoletes: java-sun-jre-X11
Obsoletes: java-sun-tools
+Obsoletes: java5-sun
+Obsoletes: java5-sun-jre
+Obsoletes: java5-sun-jre-X11
+Obsoletes: java5-sun-jre-jdbc
+Obsoletes: java5-sun-tools
Obsoletes: oracle-java7
Obsoletes: oracle-java7-jre
+Obsoletes: oracle-java7-jre-X11
Obsoletes: oracle-java7-jre-alsa
Obsoletes: oracle-java7-jre-jdbc
-Obsoletes: oracle-java7-jre-X11
Obsoletes: oracle-java7-tools
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%package jdk
Summary: OpenJDK - software development kit
-URL: http://openjdk.java.net/
-BuildRequires: /usr/bin/jar
-BuildRequires: alsa-lib-devel
-BuildRequires: ant
-BuildRequires: autoconf
-BuildRequires: bash
-%{?with_cacerts:BuildRequires: ca-certificates-update}
-BuildRequires: cups-devel
-BuildRequires: freetype-devel >= 2.3
-BuildRequires: gawk
-#BuildRequires: giflib-devel >= 5.1
-BuildRequires: glibc-misc
Summary(pl.UTF-8): OpenJDK - środowisko programistyczne
Group: Development/Languages/Java
Requires: %{name}-jar = %{version}-%{release}
Summary(pl.UTF-8): Kod OpenJDK - środowisko programistyczne
Group: Development/Languages/Java
Requires: %{name}-jre-base = %{version}-%{release}
-Requires: jpackage-utils >= 0:1.7.5-4
+Requires: jpackage-utils >= 0:1.7.5-7
Provides: jdk(%{name})
%description jdk-base
Summary: OpenJDK - runtime environment
Summary(pl.UTF-8): OpenJDK - środowisko uruchomieniowe
Group: Development/Languages/Java
-Requires: jpackage-utils >= 0:1.7.5-4
+Requires: jpackage-utils >= 0:1.7.5-7
Provides: jre(%{name})
%description jre-base
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
+%patch9 -p1
%build
# Make sure we have /proc mounted - otherwise idlc will fail later.
fi
cd common/autoconf
+rm generated-configure.sh
%{__autoconf} -o generated-configure.sh
cd ../..
# disable-debug-symbols so openjdk debuginfo handling won't conflict with ours
%configure \
+%ifarch x32
+ --with-jvm-variants=zero \
+%endif
--with-extra-cflags="%{rpmcflags}" \
--with-extra-cxxflags="%{rpmcxxflags}" \
--with-extra-ldflags="%{rpmldflags}" \
--disable-debug-symbols \
- --with-giflib=bundled \
+ --with-giflib=system \
--with-libjpeg=system \
--with-libpng=system \
--with-lcms=system \
%{jredir}/lib/cmm
%{jredir}/lib/ext
%dir %{jredir}/lib/%{jre_arch}
-%ifnarch %{x8664} x32
-%dir %{jredir}/lib/%{jre_arch}/client
-%{jredir}/lib/%{jre_arch}/client/Xusage.txt
-%attr(755,root,root) %{jredir}/lib/%{jre_arch}/client/*.so
-%endif
%dir %{jredir}/lib/%{jre_arch}/jli
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/jli/*.so
%dir %{jredir}/lib/%{jre_arch}/server
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjava_crw_demo.so
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjavajpeg.so
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjavalcms.so
-%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjawt.so
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjdwp.so
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjsdt.so
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjsig.so
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libsplashscreen.so
%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libawt_xawt.so
%attr(755,root,root) %{dstdir}/lib/%{jre_arch}/libjawt.so
+%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjawt.so
%files jre-base-alsa
%defattr(644,root,root,755)