diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index f185610..23c2b0a 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package java-16-openjdk
+# spec file
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -111,8 +111,10 @@
 # Turn on/off some features depending on openSUSE version
 %if 0%{?suse_version} > 1320
 %global with_system_pcsc 1
+%global with_system_lcms 1
 %else
 %global with_system_pcsc 0
+%global with_system_lcms 0
 %endif
 %global with_pulseaudio 1
 %bcond_with zero
@@ -143,7 +145,7 @@ Release:        0
 Summary:        OpenJDK %{featurever} Runtime Environment
 License:        Apache-1.1 AND Apache-2.0 AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-only WITH Classpath-exception-2.0 AND LGPL-2.0-only AND MPL-1.0 AND MPL-1.1 AND SUSE-Public-Domain AND W3C
 Group:          Development/Languages/Java
-URL:            http://openjdk.java.net/
+URL:            https://openjdk.java.net/
 # Sources from upstream OpenJDK project.
 Source0:        https://github.com/openjdk/%{openjdk_repo}/archive/%{openjdk_tag}.tar.gz
 # Accessibility support
@@ -229,13 +231,6 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype2-devel
-%if 0%{?suse_version} < 1500
-BuildRequires:  gcc7
-BuildRequires:  gcc7-c++
-%else
-BuildRequires:  gcc >= 7
-BuildRequires:  gcc-c++ >= 7
-%endif
 BuildRequires:  giflib-devel
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  java-ca-certificates
@@ -247,7 +242,6 @@ BuildRequires:  libXrender-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXtst-devel
 BuildRequires:  libjpeg-devel
-BuildRequires:  liblcms2-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtool
 BuildRequires:  libxslt
@@ -301,6 +295,16 @@ Provides:       jre1.6.x
 Provides:       jre1.7.x
 Provides:       jre1.8.x
 Provides:       jre1.9.x
+%if 0%{?suse_version} < 1500
+BuildRequires:  gcc7
+BuildRequires:  gcc7-c++
+%else
+BuildRequires:  gcc >= 7
+BuildRequires:  gcc-c++ >= 7
+%endif
+%if %{with_system_lcms}
+BuildRequires:  liblcms2-devel
+%endif
 %if %{bootcycle}
 BuildRequires:  java-devel >= 16
 BuildConflicts: java-devel >= 18
@@ -333,7 +337,7 @@ Requires:       jpackage-utils
 # Post requires update-alternatives to install tool update-alternatives.
 Requires(post): update-alternatives
 # Postun requires update-alternatives to uninstall tool update-alternatives.
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
 Recommends:     tzdata-java8
 # Standard JPackage base provides.
 Provides:       java-%{javaver}-headless = %{version}-%{release}
@@ -366,7 +370,7 @@ Requires:       %{name} = %{version}-%{release}
 # Post requires update-alternatives to install tool update-alternatives.
 Requires(post): update-alternatives
 # Postun requires update-alternatives to uninstall tool update-alternatives.
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
 # Standard JPackage devel provides.
 Provides:       java-%{javaver}-devel = %{version}
 Provides:       java-devel = %{javaver}
@@ -410,7 +414,7 @@ Requires:       jpackage-utils
 # Post requires update-alternatives to install javadoc alternative.
 Requires(post): update-alternatives
 # Postun requires update-alternatives to uninstall javadoc alternative.
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
 # Standard JPackage javadoc provides.
 Provides:       java-%{javaver}-javadoc = %{version}-%{release}
 Provides:       java-javadoc = %{version}-%{release}
@@ -458,8 +462,10 @@ rm -rvf src/java.base/share/native/libzip/zlib-*
 find src/java.desktop/share/native/libjavajpeg ! -name imageioJPEG.c ! -name jpegdecoder.c -type f -delete
 rm -rvf src/java.desktop/share/native/libsplashscreen/libpng
 rm -rvf src/java.desktop/share/native/libsplashscreen/giflib
+%if %{with_system_lcms}
 rm -rvf src/java.desktop/share/native/liblcms/cms*
 rm -rvf src/java.desktop/share/native/liblcms/lcms2*
+%endif
 
 %patch1
 %if %{with_pulseaudio}
@@ -568,7 +574,9 @@ bash ../configure \
     --with-libjpeg=system \
     --with-giflib=system \
     --with-libpng=system \
+%if %{with_system_lcms}
     --with-lcms=system \
+%endif
 %if %{with_system_pcsc}
     --with-pcsclite=system \
 %endif
@@ -1195,7 +1203,9 @@ fi
 %{_jvmdir}/%{sdkdir}/lib/libprefs.so
 %{_jvmdir}/%{sdkdir}/lib/librmi.so
 %{_jvmdir}/%{sdkdir}/lib/libsctp.so
+%ifarch x86_64
 %{_jvmdir}/%{sdkdir}/lib/libsvml.so
+%endif
 %{_jvmdir}/%{sdkdir}/lib/libsyslookup.so
 %{_jvmdir}/%{sdkdir}/lib/libverify.so
 %{_jvmdir}/%{sdkdir}/lib/libzip.so