Release: 2

[packages/openjdk9.git] / openjdk8.spec

diff --git a/openjdk8.spec b/openjdk8.spec
index dfc6eaa36a00bd00069f17528df1251c411c4d20..fe0b73abde25476316d5bbf73b3ab29dc2ee95c1 100644 (file)
--- a/openjdk8.spec
+++ b/openjdk8.spec
@@ -1,11 +1,12 @@
 #
+# 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
@@ -21,13 +22,13 @@
 # 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
@@ -55,9 +56,21 @@ Patch4:              system-libjpeg.patch
 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
@@ -83,25 +96,25 @@ Suggests:   %{name}-jre-X11
 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)
 
@@ -140,18 +153,6 @@ wszystkie komponenty OpenJDK, w tym środowisko programistyczne
 
 %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}
@@ -422,6 +423,8 @@ done
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.
@@ -431,6 +434,7 @@ if [ ! -f /proc/self/stat ]; then
 fi
 
 cd common/autoconf
+rm generated-configure.sh
 %{__autoconf} -o generated-configure.sh
 cd ../..
 
@@ -449,11 +453,14 @@ chmod a+x configure
 
 # 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 \
@@ -757,11 +764,6 @@ rm -rf $RPM_BUILD_ROOT
 %{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
@@ -784,7 +786,6 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -845,6 +846,7 @@ rm -rf $RPM_BUILD_ROOT
 %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)