diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 76e3a50..be6ba0f 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package javapackages-tools
+# 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
@@ -78,6 +78,9 @@ BuildArch:      noarch
 Provides:       mvn(com.sun:tools) = SYSTEM
 Provides:       mvn(sun.jdk:jconsole) = SYSTEM
 %endif
+%if ! 0%{?suse_version}
+BuildArch:      noarch
+%endif
 
 %description
 This package provides macros and scripts to support Java packaging.
@@ -101,7 +104,6 @@ Requires:       javapackages-tools = %{version}
 This package contains files needed by local mode for Gradle, which
 allows artifact resolution using XMvn resolver.
 
-
 %package -n javapackages-ivy
 Summary:        Local mode for Apache Ivy (files)
 Group:          Development/Languages/Java
@@ -124,6 +126,7 @@ Module for handling, querying and manipulating of various files for Java
 packaging in Linux distributions
 
 %else
+
 %package -n python3-javapackages
 Summary:        Module for handling various files for Java packaging
 Group:          Development/Languages/Java
@@ -150,7 +153,13 @@ This package provides non-essential macros and scripts to support Java packaging
 
 %prep
 %setup -q -n javapackages-%{version}
-%autopatch -p1
+%if 0%{?suse_version}
+%patch0 -p1
+%endif
+%patch1 -p1
+%if 0%{?suse_version}
+%patch2 -p1
+%endif
 
 # The usr/lib is hardcoded in configuration files too
 new_dir=$(echo %{_libdir} | sed 's#/##')
@@ -241,6 +250,7 @@ popd
 %files -n javapackages-filesystem -f files-filesystem
 
 %else
+
 %files -n javapackages-local -f files-local
 %dir %{_datadir}/java-utils