- unconditional noarch subpackages

[packages/openjdk9.git] / openjdk9.spec

diff --git a/openjdk9.spec b/openjdk9.spec
index 407bb6821786685ac00649e49f61a66adab6c1cc..3b75f37159e7a7331eaf20f2b5013404610d57de 100644 (file)
--- a/openjdk9.spec
+++ b/openjdk9.spec
@@ -11,6 +11,10 @@
 %define                with_aot        1
 %endif
 
+%ifarch x32
+%define                with_zero       1
+%endif
+
 # class data version seen with file(1) that this jvm is able to load
 %define                _classdataversion 53.0
 
@@ -365,9 +369,7 @@ i został zbudowany wyłącznie przy użyciu wolnego oprogramowania.
 Summary:       OpenJDK - sources
 Summary(pl.UTF-8):     OpenJDK - kod źródłowy
 Group:         Documentation
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description jdk-sources
 Source code for the OpenJDK development kit and Java standard library.
@@ -380,9 +382,7 @@ biblioteki Javy.
 Summary:       OpenJDK - examples
 Summary(pl.UTF-8):     OpenJDK - przykłady
 Group:         Documentation
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description examples
 Code examples for OpenJDK.
@@ -427,14 +427,13 @@ 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_zero:--with-jvm-variants=zero} \
        --with-boot-jdk="%{java_home}" \
        --with-extra-cflags="%{rpmcppflags} %{rpmcflags} -fcommon -fno-tree-dse" \
        --with-extra-cxxflags="%{rpmcppflags} %{rpmcxxflags} -fcommon -fno-tree-dse" \
        --with-extra-ldflags="%{rpmldflags}" \
        --with-native-debug-symbols=none \
+       --disable-full-docs \
        --disable-javac-server \
        --disable-hotspot-gtest \
        --disable-warnings-as-errors \
@@ -531,7 +530,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/jdb
 %attr(755,root,root) %{_bindir}/jdeprscan
 %attr(755,root,root) %{_bindir}/jdeps
-%attr(755,root,root) %{_bindir}/jhsdb
+%{!?with_zero:%attr(755,root,root) %{_bindir}/jhsdb}
 %attr(755,root,root) %{_bindir}/jimage
 %attr(755,root,root) %{_bindir}/jinfo
 %attr(755,root,root) %{_bindir}/jlink
@@ -609,7 +608,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dstdir}/bin/jdb
 %attr(755,root,root) %{dstdir}/bin/jdeprscan
 %attr(755,root,root) %{dstdir}/bin/jdeps
-%attr(755,root,root) %{dstdir}/bin/jhsdb
+%{!?with_zero:%attr(755,root,root) %{dstdir}/bin/jhsdb}
 %attr(755,root,root) %{dstdir}/bin/jimage
 %attr(755,root,root) %{dstdir}/bin/jinfo
 %attr(755,root,root) %{dstdir}/bin/jlink
@@ -699,7 +698,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{dstdir}/lib/server
 %attr(755,root,root) %{dstdir}/lib/server/*.so
 %{dstdir}/lib/server/Xusage.txt
-%{dstdir}/lib/classlist
+%{!?with_zero:%{dstdir}/lib/classlist}
 %{dstdir}/lib/jrt-fs.jar
 %{dstdir}/lib/jvm.cfg
 %attr(755,root,root) %{dstdir}/lib/libattach.so
@@ -728,9 +727,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{dstdir}/lib/libmlib_image.so
 %attr(755,root,root) %{dstdir}/lib/libnet.so
 %attr(755,root,root) %{dstdir}/lib/libnio.so
-%ifnarch x32
-%attr(755,root,root) %{dstdir}/lib/libsaproc.so
-%endif
+%{!?with_zero:%attr(755,root,root) %{dstdir}/lib/libsaproc.so}
 %{?with_sunec:%attr(755,root,root) %{dstdir}/lib/libsunec.so}
 %attr(755,root,root) %{dstdir}/lib/libunpack.so
 %attr(755,root,root) %{dstdir}/lib/libverify.so