diff --git a/COPASI.spec b/COPASI.spec
index c547ac0..8c98680 100644
--- a/COPASI.spec
+++ b/COPASI.spec
@@ -9,23 +9,19 @@
 %endif
 %endif
 
-%global  buildid    184
+%global buildid    184
+%global octpkg COPASI
 
 %global with_python2 1
 %global with_python3 1
 
-%ifarch s390 s390x %{arm} aarch64 %{power64}
+# Disable Java binding
 %global with_java    0
-%else
-%global with_java    1
-%endif
+Obsoletes: java-%{octpkg} < 0:4.23.184-2
 
-# Disable Octave binding on ARM ('virtual memory exhausted' issue)
-%ifarch s390 s390x %{arm}
+# Disable Octave binding ('virtual memory exhausted' issue)
 %global with_octave  0
-%else
-%global with_octave  1
-%endif
+Obsoletes: octave-%{octpkg} < 0:4.23.184-2
 
 %global with_perl    1
 %global with_r       1
@@ -44,7 +40,6 @@
 # Not ready
 %global with_qt5     0
 
-%global octpkg COPASI
 %if 0%{?with_octave}
 # Exclude .oct files from provides
 %global __provides_exclude_from ^%{octpkglibdir}/.*\\.oct$
@@ -394,8 +389,7 @@ export INCBLAS=%{_includedir}
  -DENABLE_FLEX_BISON:BOOL=ON -DBISON_EXECUTABLE:FILEPATH=%{_bindir}/bison \
  -DPREFER_STATIC:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=YES -DCombine-static_DIR:PATH=%{_libdir}/cmake ..
 
-##'Parallel make' breaks builds
-make -j1
+%make_build
 popd
 
 ## ----> Move to build2 directory ##
@@ -611,7 +605,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/*.appd
 %changelog
 * Sun Apr 29 2018 Antonio Trande <sagitterATfedoraproject.org> - 4.23.184-2
 - Now built with Qt4
-- Do not use parallel Make jobs
+- Disable java/octave bindings
 
 * Sun Apr 29 2018 Antonio Trande <sagitterATfedoraproject.org> - 4.23.184-1
 - Update to version 4.23 -build 184