Pass JOBS=N instead -jN to make

[packages/openjdk9.git] / openjdk8.spec

diff --git a/openjdk8.spec b/openjdk8.spec
index f9e11205dc93a5b478d56446d6ef03e31232200a..ea2de66f5b8412a24b5ac1493cc2987e485a7168 100644 (file)
--- a/openjdk8.spec
+++ b/openjdk8.spec
@@ -1,11 +1,12 @@
 #
 # TODO:
-#      - use the release snapshots (the jdk8u repo?) instead of latest 'b' tag
-#      - make it build
-#      - make it install
 #      - 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?
+#      - '*** WARNING: no sources found for ...'
 
 %bcond_with bootstrap   # build a bootstrap version, using icedtea6
 %bcond_without cacerts # don't include the default CA certificates
@@ -17,40 +18,48 @@
 %endif
 
 # class data version seen with file(1) that this jvm is able to load
-%define                _classdataversion 51.0
+%define                _classdataversion 52.0
+# 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
 Name:          openjdk8
-%define        minor   132
-Version:       1.8.0.%{minor}
+%define        ver_u   66
+%define        ver_b   02
+Version:       8u%{ver_u}.b%{ver_b}
 Release:       0.1
 License:       GPL v2
 Group:         Development/Languages/Java
-Source0:       openjdk8-b%{minor}.tar.bz2
-# Source0-md5: 7ae143bc2b840f1bfbfa15a1dcbcc371
-Source1:       openjdk8-corba-b%{minor}.tar.bz2
-# Source1-md5: a54c4b046d4f9b7dc0e64b79b734d2f3
-Source2:       openjdk8-hotspot-b%{minor}.tar.bz2
-# Source2-md5: 1368abb3e02079bb7cd802d2bef136b4
-Source3:       openjdk8-jaxp-b%{minor}.tar.bz2
-# Source3-md5: dccca275bad921fc036221ba36f9596e
-Source4:       openjdk8-jaxws-b%{minor}.tar.bz2
-# Source5-md5: faf2d077d9c41a8c11a2b038fb5d2e50
-Source5:       openjdk8-jdk-b%{minor}.tar.bz2
-# Source5-md5: a14e4f9a26a229fdc59dc77cf9754fee
-Source6:       openjdk8-langtools-b%{minor}.tar.bz2
-# Source6-md5: 6f6dd27e4ca48a49c0c2ec16310c44f3
-Source7:       openjdk8-nashorn-b%{minor}.tar.bz2
-# Source7-md5: 19581a68b0ffa30d8a23f384fcb8c91d
+Source0:       openjdk8-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
+# Source0-md5: 1d115662e175470270e89a4da8e0fce2
+Source1:       openjdk8-corba-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
+# Source1-md5: e14d8f51b9ca30d798094a2867f3f5d0
+Source2:       openjdk8-hotspot-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
+# Source2-md5: b49a7b7f2db5b07306b7b5739e87ccc0
+Source3:       openjdk8-jaxp-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
+# Source3-md5: 6bd5ae187272a209439d1a95ac6c9025
+Source4:       openjdk8-jaxws-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
+# Source4-md5: 15e6a93009bdc73194e7118988d5ab8d
+Source5:       openjdk8-jdk-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
+# Source5-md5: 74f2cf3815659b83993c4187e7fc4f6b
+Source6:       openjdk8-langtools-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
+# Source6-md5: de5c9b5fdbcd75028b71ed667d4b99d2
+Source7:       openjdk8-nashorn-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
+# Source7-md5: 7da4e88349cfc45ee9726eaa4386be03
 Source10:      make-cacerts.sh
 Patch0:                adjust-mflags.patch
 Patch1:                format_strings.patch
+Patch2:                CompileDemos.patch
+Patch3:                libpath.patch
+Patch4:                system-libjpeg.patch
+Patch5:                system-libpng.patch
+Patch6:                system-lcms.patch
+Patch7:                system-pcsclite.patch
 URL:           http://openjdk.java.net/
 BuildRequires: alsa-lib-devel
 BuildRequires: ant
 BuildRequires: autoconf
-BuildRequires: automake
 BuildRequires: bash
 %{?with_cacerts:BuildRequires: ca-certificates-update}
 BuildRequires: cups-devel
@@ -60,8 +69,11 @@ BuildRequires:       gawk
 #BuildRequires:        giflib-devel >= 5.1
 BuildRequires: glibc-misc
 %buildrequires_jdk
+BuildRequires: lcms2-devel
 BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
 BuildRequires: lsb-release
+BuildRequires: pcsc-lite-devel
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.557
 BuildRequires: unzip
@@ -144,8 +156,8 @@ Group:              Development/Languages/Java
 Requires:      %{name}-jar = %{version}-%{release}
 Requires:      %{name}-jdk-base = %{version}-%{release}
 Requires:      %{name}-jre = %{version}-%{release}
-Provides:      j2sdk = %{_version}
-Provides:      jdk = %{_version}
+Provides:      j2sdk = %{_jdkversion}
+Provides:      jdk = %{_jdkversion}
 Obsoletes:     blackdown-java-sdk
 Obsoletes:     ibm-java
 Obsoletes:     icedtea6-jdk
@@ -204,7 +216,7 @@ Provides:   java(jmx) = 1.4
 Provides:      java(jndi) = %{version}
 Provides:      java(jsse) = %{version}
 Provides:      java1.4
-Provides:      jre = %{_version}
+Provides:      jre = %{_jdkversion}
 Obsoletes:     icedtea6-jre
 Obsoletes:     icedtea7-jre
 Obsoletes:     java(jaas)
@@ -239,7 +251,7 @@ Summary(pl.UTF-8):  OpenJDK - środowisko uruchomieniowe - obsługa X11
 Group:         Development/Languages/Java
 Requires:      %{name}-jre = %{version}-%{release}
 Requires:      %{name}-jre-base-X11 = %{version}-%{release}
-Provides:      jre-X11 = %{_version}
+Provides:      jre-X11 = %{_jdkversion}
 Obsoletes:     icedtea6-jre-X11
 Obsoletes:     icedtea7-jre-X11
 Obsoletes:     java-sun-jre-X11
@@ -395,14 +407,20 @@ Code examples for OpenJDK.
 Przykłady dla OpenJDK.
 
 %prep
-%setup -qn jdk8-jdk8-b%{minor} -a1 -a2 -a3 -a4 -a5 -a6 -a7
+%setup -qn jdk8u-jdk8u%{ver_u}-b%{ver_b} -a1 -a2 -a3 -a4 -a5 -a6 -a7
 
-for d in *-jdk8-b* ; do
-       ln -s "$d" "${d%%-jdk8-b*}"
+for d in *-jdk8u*-b* ; do
+       mv "$d" "${d%%-jdk8u*-b*}"
 done
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.
@@ -411,11 +429,14 @@ if [ ! -f /proc/self/stat ]; then
        exit 1
 fi
 
-unset JAVA_HOME
-export SHELL=/bin/bash
+cd common/autoconf
+%{__autoconf} -o generated-configure.sh
+cd ../..
 
 mkdir -p build-bin
-export PATH="$(pwd)/build-bin:$PATH"
+export JAVA_HOME=%{java_home}
+export PATH="$JAVA_HOME/bin:$PATH"
+export SHELL=/bin/bash
 
 chmod a+x configure
 
@@ -424,6 +445,10 @@ chmod a+x configure
        --with-extra-cxxflags="%{rpmcxxflags}" \
        --with-extra-ldflags="%{rpmldflags}" \
        --with-giflib=bundled \
+       --with-libjpeg=system \
+       --with-libpng=system \
+       --with-lcms=system \
+       --with-libpcsclite=system \
        --with-zlib=system
 
 specdir="$(dirname build/*-release/spec.gmk)"
@@ -432,9 +457,11 @@ SHELL=/bin/bash
 EOF
 [ -d tmp-bin ] || ln -s "$specdir/jdk/bin" tmp-bin
 
-%{__make} \
+%{__make} all \
+       -j1 JOBS=%{__jobs} \
        LOG=debug
 
+export PATH="$(pwd)/build-bin:$PATH"
 %{?with_cacerts:%{__sh} %{SOURCE10}}
 
 %install
@@ -444,7 +471,7 @@ install -d $RPM_BUILD_ROOT{%{_bindir},%{dstdir},%{_mandir}/ja} \
        $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
 # install the 'JDK image', it contains the JRE too
-cp -a openjdk.build/j2sdk-image/* $RPM_BUILD_ROOT%{dstdir}
+cp -a build/*-release/images/j2sdk-image/* $RPM_BUILD_ROOT%{dstdir}
 
 # convenience symlinks without version number
 ln -s %{dstreldir} $RPM_BUILD_ROOT%{_jvmdir}/%{name}
@@ -497,9 +524,6 @@ done
 # some apps (like opera) looks for it in different place
 ln -s server/libjvm.so $RPM_BUILD_ROOT%{jredir}/lib/%{jre_arch}/libjvm.so
 
-# uses /usr/share/javazi if present and we require that package
-%{__rm} -r $RPM_BUILD_ROOT%{jredir}/lib/zi
-
 %{__rm} $RPM_BUILD_ROOT%{dstdir}/{,jre/}{ASSEMBLY_EXCEPTION,LICENSE,THIRD_PARTY_README}
 
 %{?with_cacerts:install cacerts $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/security}
@@ -513,7 +537,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files jdk
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/apt
 %attr(755,root,root) %{_bindir}/extcheck
 %attr(755,root,root) %{_bindir}/idlj
 %attr(755,root,root) %{_bindir}/jarsigner
@@ -525,6 +548,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/jcmd
 %attr(755,root,root) %{_bindir}/jconsole
 %attr(755,root,root) %{_bindir}/jdb
+%attr(755,root,root) %{_bindir}/jdeps
 %attr(755,root,root) %{_bindir}/jhat
 %attr(755,root,root) %{_bindir}/jinfo
 %attr(755,root,root) %{_bindir}/jmap
@@ -542,7 +566,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/wsimport
 %attr(755,root,root) %{_bindir}/xjc
 %{_jvmdir}/java
-%{_mandir}/man1/apt.1*
 %{_mandir}/man1/extcheck.1*
 %{_mandir}/man1/idlj.1*
 %{_mandir}/man1/jarsigner.1*
@@ -553,6 +576,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/jcmd.1*
 %{_mandir}/man1/jconsole.1*
 %{_mandir}/man1/jdb.1*
+%{_mandir}/man1/jdeps.1*
 %{_mandir}/man1/jhat.1*
 %{_mandir}/man1/jinfo.1*
 %{_mandir}/man1/jmap.1*
@@ -569,7 +593,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/wsgen.1*
 %{_mandir}/man1/wsimport.1*
 %{_mandir}/man1/xjc.1*
-%lang(ja) %{_mandir}/ja/man1/apt.1*
 %lang(ja) %{_mandir}/ja/man1/extcheck.1*
 %lang(ja) %{_mandir}/ja/man1/idlj.1*
 %lang(ja) %{_mandir}/ja/man1/jarsigner.1*
@@ -580,6 +603,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ja) %{_mandir}/ja/man1/jcmd.1*
 %lang(ja) %{_mandir}/ja/man1/jconsole.1*
 %lang(ja) %{_mandir}/ja/man1/jdb.1*
+%lang(ja) %{_mandir}/ja/man1/jdeps.1*
 %lang(ja) %{_mandir}/ja/man1/jhat.1*
 %lang(ja) %{_mandir}/ja/man1/jinfo.1*
 %lang(ja) %{_mandir}/ja/man1/jmap.1*
@@ -599,12 +623,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files jdk-base
 %defattr(644,root,root,755)
-%doc openjdk.build/j2sdk-image/THIRD_PARTY_README
-%doc openjdk.build/j2sdk-image/ASSEMBLY_EXCEPTION
+%doc build/*-release/images/j2sdk-image/THIRD_PARTY_README
+%doc build/*-release/images/j2sdk-image/ASSEMBLY_EXCEPTION
 %dir %{dstdir}
 %{_jvmdir}/%{name}
 %attr(755,root,root) %{dstdir}/bin/appletviewer
-%attr(755,root,root) %{dstdir}/bin/apt
 %attr(755,root,root) %{dstdir}/bin/extcheck
 %attr(755,root,root) %{dstdir}/bin/idlj
 %attr(755,root,root) %{dstdir}/bin/jar
@@ -617,6 +640,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dstdir}/bin/jconsole
 %attr(755,root,root) %{dstdir}/bin/jcmd
 %attr(755,root,root) %{dstdir}/bin/jdb
+%attr(755,root,root) %{dstdir}/bin/jdeps
 %attr(755,root,root) %{dstdir}/bin/jhat
 %attr(755,root,root) %{dstdir}/bin/jinfo
 %attr(755,root,root) %{dstdir}/bin/jmap
@@ -648,11 +672,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{dstdir}/lib/%{jre_arch}
 %dir %{dstdir}/lib/%{jre_arch}/jli
 %attr(755,root,root) %{dstdir}/lib/%{jre_arch}/jli/*.so
-%{dstdir}/tapset
 
 %files jre
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/java
+%attr(755,root,root) %{_bindir}/jjs
 %attr(755,root,root) %{_bindir}/keytool
 %attr(755,root,root) %{_bindir}/orbd
 %attr(755,root,root) %{_bindir}/pack200
@@ -662,6 +686,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/tnameserv
 %attr(755,root,root) %{_bindir}/unpack200
 %{_mandir}/man1/java.1*
+%{_mandir}/man1/jjs.1*
 %{_mandir}/man1/keytool.1*
 %{_mandir}/man1/orbd.1*
 %{_mandir}/man1/pack200.1*
@@ -671,6 +696,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/tnameserv.1*
 %{_mandir}/man1/unpack200.1*
 %lang(ja) %{_mandir}/ja/man1/java.1*
+%lang(ja) %{_mandir}/ja/man1/jjs.1*
 %lang(ja) %{_mandir}/ja/man1/keytool.1*
 %lang(ja) %{_mandir}/ja/man1/orbd.1*
 %lang(ja) %{_mandir}/ja/man1/pack200.1*
@@ -694,6 +720,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{dstdir}/bin
 %attr(755,root,root) %{jredir}/bin/java
 %attr(755,root,root) %{dstdir}/bin/java
+%attr(755,root,root) %{jredir}/bin/jjs
+%attr(755,root,root) %{dstdir}/bin/jjs
 %attr(755,root,root) %{jredir}/bin/keytool
 %attr(755,root,root) %{dstdir}/bin/keytool
 %attr(755,root,root) %{jredir}/bin/orbd
@@ -720,32 +748,30 @@ rm -rf $RPM_BUILD_ROOT
 %{jredir}/lib/%{jre_arch}/client/Xusage.txt
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/client/*.so
 %endif
-%dir %{jredir}/lib/%{jre_arch}/headless
-%attr(755,root,root) %{jredir}/lib/%{jre_arch}/headless/*.so
 %dir %{jredir}/lib/%{jre_arch}/jli
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/jli/*.so
+%{jredir}/lib/%{jre_arch}/jli/*.diz
 %dir %{jredir}/lib/%{jre_arch}/server
 %{jredir}/lib/%{jre_arch}/server/Xusage.txt
-%ifnarch x32
-%{jredir}/lib/%{jre_arch}/server/classes.jsa
-%endif
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/server/*.so
+%{jredir}/lib/%{jre_arch}/server/*.diz
 %{jredir}/lib/%{jre_arch}/jvm.cfg
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libattach.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libawt.so
+%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libawt_headless.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libdt_socket.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libhprof.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libinstrument.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libj2gss.so
-%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libj2krb5.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libj2pcsc.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libj2pkcs11.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjaas_unix.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjava.so
+%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libsctp.so
+%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libsunec.so
+%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}/libjavasctp.so
-%attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjava_crw_demo.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
@@ -764,10 +790,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libunpack.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libverify.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libzip.so
+%{jredir}/lib/%{jre_arch}/*.diz
 %{jredir}/lib/images
 %{jredir}/lib/management
 %{jredir}/lib/security
-
 %if %{with webstart}
 %{jredir}/lib/about.jar
 %{jredir}/lib/about.jnlp
@@ -778,7 +804,7 @@ rm -rf $RPM_BUILD_ROOT
 %{jredir}/lib/content-types.properties
 %{jredir}/lib/currency.data
 %{jredir}/lib/flavormap.properties
-%{jredir}/lib/fontconfig.*
+%{jredir}/lib/hijrah-config-umalqura.properties
 %{jredir}/lib/jce.jar
 %attr(755, root, root) %{jredir}/lib/jexec
 %{jredir}/lib/jsse.jar
@@ -790,10 +816,10 @@ rm -rf $RPM_BUILD_ROOT
 %{jredir}/lib/psfont.properties.ja
 %{jredir}/lib/psfontj2d.properties
 %{jredir}/lib/resources.jar
-%{jredir}/lib/rhino.jar
 %{jredir}/lib/rt.jar
 %{jredir}/lib/sound.properties
-%{jredir}/lib/tz.properties
+%{jredir}/lib/tzdb.dat
+%{jredir}/lib/*.diz
 %{jvmjardir}
 
 %files jre-X11
@@ -806,9 +832,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{jredir}/bin/policytool
 %attr(755,root,root) %{dstdir}/bin/policytool
-%dir %{jredir}/lib/%{jre_arch}/xawt
-%attr(755,root,root) %{jredir}/lib/%{jre_arch}/xawt/*.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
 
 %files jre-base-alsa
 %defattr(644,root,root,755)
@@ -818,9 +844,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libfontmanager.so
 
+%if 0
 %files jre-base-gtk
 %defattr(644,root,root,755)
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libjavagtk.so
+%endif
 
 %files jar
 %defattr(644,root,root,755)