The package rpms/COPASI.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/COPASI.git/commit/?id=fa7fe2ce9c3...
https://src.fedoraproject.org/cgit/rpms/COPASI.git/commit/?id=85a271130e7...
https://src.fedoraproject.org/cgit/rpms/COPASI.git/commit/?id=a47f7d4dd18...
https://src.fedoraproject.org/cgit/rpms/COPASI.git/commit/?id=14b4b758cec....
Change:
-%ifarch s390 s390x %{arm}
-%ifarch s390x %{arm}
+%ifarch s390 s390x %{arm}
+%ifarch s390x %{arm}
Thanks.
Full change:
============
commit fa7fe2ce9c3dcdde5f4ea8160ce54e459d525e3b
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu May 3 11:30:12 2018 +0200
Disable java/octave bindings
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
commit 85a271130e70e1faa278923e7aac45f058fc4a31
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Wed May 2 17:59:13 2018 +0200
Update to version 4.23 -build 184
diff --git a/.gitignore b/.gitignore
index 9583b19..5567ff1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
/COPASI-Build-165.tar.gz
/COPASI-Build-166.tar.gz
/COPASI-Build-170.tar.gz
+/COPASI-Build-184.tar.gz
diff --git a/COPASI-find_QWT5-QTMML-SBW.patch b/COPASI-find_QWT5-QTMML-SBW.patch
index 363993a..20a9ef7 100644
--- a/COPASI-find_QWT5-QTMML-SBW.patch
+++ b/COPASI-find_QWT5-QTMML-SBW.patch
@@ -6,16 +6,16 @@
/opt/include
- /usr/freeware/include
+ /usr/include
- PATH_SUFFIXES qwt qwt-qt4 qwt-qt5 qwt6
+ PATH_SUFFIXES qt5/qwt6 qwt qwt-qt4 qwt-qt5 qwt6
NO_DEFAULT_PATH)
@@ -35,7 +35,7 @@
find_library(QWT_LIBRARY
- NAMES qwt-static
+ NAMES qwt-qt5
- qwt-qt4
+ qwt5-qt4
- qwt-qt5
+ qwt-static
qwt
PATHS $ENV{QWT_DIR}/lib
--- CMakeModules/FindQtMmlQt4.orig.cmake 2015-06-17 07:55:18.000000000 +0200
diff --git a/COPASI-find_QWT6-QTMML-SBW.patch b/COPASI-find_QWT6-QTMML-SBW.patch
index 2c3235d..d25ecc4 100644
--- a/COPASI-find_QWT6-QTMML-SBW.patch
+++ b/COPASI-find_QWT6-QTMML-SBW.patch
@@ -10,16 +10,10 @@
$ENV{QWT_DIR}
~/Library/Frameworks
/Library/Frameworks
-@@ -34,11 +35,12 @@
- endif ()
-
- find_library(QWT_LIBRARY
-- NAMES qwt-static
-+ NAMES qwt
-+ qwt-static
+@@ -38,7 +39,8 @@
qwt-qt4
- qwt-qt5
-- qwt
+ qwt-static
+ qwt
- PATHS $ENV{QWT_DIR}/lib
+ PATHS @@libdir@@
+ $ENV{QWT_DIR}/lib
diff --git a/COPASI-fix_exe_permissions.patch b/COPASI-fix_exe_permissions.patch
index 7d40170..b913759 100644
--- a/COPASI-fix_exe_permissions.patch
+++ b/COPASI-fix_exe_permissions.patch
@@ -15,7 +15,7 @@
--- copasi/CopasiUI/CMakeLists.orig.txt 2015-07-06 20:53:01.000000000 +0200
+++ copasi/CopasiUI/CMakeLists.txt 2015-07-18 14:25:32.353337151 +0200
-@@ -104,7 +104,11 @@
+@@ -109,7 +109,11 @@
if(NOT APPLE)
SET(APPS "\${CMAKE_INSTALL_PREFIX}/bin/CopasiUI${CMAKE_EXECUTABLE_SUFFIX}"
CACHE INTERNAL "")
diff --git a/COPASI-fix_install_libpaths.patch b/COPASI-fix_install_libpaths.patch
index af84592..8f03174 100644
--- a/COPASI-fix_install_libpaths.patch
+++ b/COPASI-fix_install_libpaths.patch
@@ -1,7 +1,7 @@
##This patch sets libraries' installation paths according to the Fedora packaging
guidelines
--- CMakeLists.orig.txt 2015-06-03 14:40:54.000000000 +0200
+++ CMakeLists.txt 2015-06-11 12:29:51.346501583 +0200
-@@ -694,13 +694,13 @@
+@@ -843,13 +843,13 @@
file(GLOB_RECURSE WIZARD_HELP_FILES
"${PROJECT_SOURCE_DIR}/copasi/wizard/help_html" copasi/wizard/help_html/*.html)
file(GLOB_RECURSE WIZARD_IMAGE_FILES
"${PROJECT_SOURCE_DIR}/copasi/wizard/help_html/figures"
copasi/wizard/help_html/figures/*.png)
file(GLOB_RECURSE EXAMPLE_FILES "${PROJECT_SOURCE_DIR}/TestSuite/distribution"
TestSuite/distribution/*.*)
@@ -11,17 +11,17 @@
+install(FILES ${WIZARD_HELP_FILES} DESTINATION
${CMAKE_INSTALL_PREFIX}/share/copasi/doc/html)
+install(FILES ${WIZARD_IMAGE_FILES} DESTINATION
${CMAKE_INSTALL_PREFIX}/share/copasi/doc/html/figures)
+install(FILES ${EXAMPLE_FILES} DESTINATION
${CMAKE_INSTALL_PREFIX}/share/copasi/examples)
- install(FILES
- "${PROJECT_SOURCE_DIR}/copasi/UI/icons/Copasi.ico"
- "${PROJECT_SOURCE_DIR}/copasi/UI/icons/CopasiDoc.ico"
+ install(FILES
+ "${PROJECT_SOURCE_DIR}/copasi/UI/icons/Copasi.ico"
+ "${PROJECT_SOURCE_DIR}/copasi/UI/icons/CopasiDoc.ico"
- DESTINATION share/copasi/icons)
+ DESTINATION share/icons/copasi/icons)
- install(FILES
- "${PROJECT_SOURCE_DIR}/copasi/MIRIAM/MIRIAMResources.xml"
+ install(FILES
+ "${PROJECT_SOURCE_DIR}/copasi/MIRIAM/MIRIAMResources.xml"
DESTINATION share/copasi/config)
--- copasi/bindings/csharp/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100
+++ copasi/bindings/csharp/CMakeLists.txt 2015-01-07 16:29:49.830302408 +0100
-@@ -145,9 +145,7 @@
+@@ -157,9 +157,7 @@
target_link_libraries(binding_csharp_native_lib ${SE_LIBS} ${SE_EXTERNAL_LIBS} )
@@ -32,7 +32,7 @@
####################################################################
#
-@@ -173,9 +173,9 @@
+@@ -185,9 +185,9 @@
add_custom_target(binding_csharp_managed_lib ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/copasicsP.dll)
add_dependencies(binding_csharp_managed_lib binding_csharp_swig)
@@ -46,7 +46,7 @@
# they still work with the current objectmodel
--- copasi/bindings/perl/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100
+++ copasi/bindings/perl/CMakeLists.txt 2015-01-07 16:25:59.264689795 +0100
-@@ -142,7 +142,7 @@
+@@ -153,7 +153,7 @@
string(REPLACE "'" "" PERL_PLATFORM ${PERL_PLATFORM})
string(REPLACE ";" "" PERL_PLATFORM ${PERL_PLATFORM})
string(REPLACE "archname=" "" PERL_PLATFORM ${PERL_PLATFORM})
@@ -55,7 +55,7 @@
set(PERL_PACKAGE_INSTALL_BIN_DIR ${PERL_PACKAGE_INSTALL_DIR}/auto/COPASI)
else()
set(PERL_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/perl)
-@@ -159,5 +159,5 @@
+@@ -170,5 +170,5 @@
set_target_properties(binding_perl_lib PROPERTIES SUFFIX ".bundle")
endif()
@@ -64,7 +64,7 @@
--- copasi/bindings/python/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100
+++ copasi/bindings/python/CMakeLists.txt 2015-01-07 19:32:33.235855748 +0100
-@@ -134,10 +134,10 @@
+@@ -165,13 +165,13 @@
set(PYTHON_PACKAGE_INSTALL_DIR ${MISC_PREFIX}bindings/python)
endif()
@@ -77,9 +77,12 @@
file(GLOB examples ${CMAKE_CURRENT_SOURCE_DIR}/examples/*.py)
-INSTALL(FILES ${examples} DESTINATION ${MISC_PREFIX}bindings/python)
+INSTALL(FILES ${examples} DESTINATION ${PYTHON_PACKAGE_INSTALL_DIR}/copasi/examples)
+
+ macro(ADJUST_PYTHONPATH target)
+
--- copasi/bindings/java/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100
+++ copasi/bindings/java/CMakeLists.txt 2015-01-07 21:08:43.571075012 +0100
-@@ -145,7 +145,7 @@
+@@ -149,7 +149,7 @@
set_target_properties (binding_java_lib PROPERTIES SUFFIX ".jnilib")
endif()
@@ -88,7 +91,7 @@
target_link_libraries(binding_java_lib ${SE_LIBS} ${SE_EXTERNAL_LIBS} )
-@@ -177,9 +177,9 @@
+@@ -181,9 +181,9 @@
install(FILES ${COPASI_JAR}
${COPASI_GUI_JAR}
@@ -102,7 +105,7 @@
# they still work with the current objectmodel
--- copasi/bindings/octave/CMakeLists.orig.txt 2015-01-07 15:45:42.000000000 +0100
+++ copasi/bindings/octave/CMakeLists.txt 2015-01-08 18:34:10.609971192 +0100
-@@ -132,11 +132,11 @@
+@@ -145,12 +145,12 @@
#
set(OCTAVE_PACKAGE_INSTALL_DIR)
if (UNIX OR CYGWIN)
@@ -114,3 +117,6 @@
-INSTALL(TARGETS binding_octave_lib DESTINATION ${OCTAVE_PACKAGE_INSTALL_DIR} )
+INSTALL(TARGETS binding_octave_lib PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION
${OCTAVE_PACKAGE_INSTALL_DIR})
+
+ add_test(NAME octave_test_version
+ COMMAND octave --no-gui --eval
"COPASI;display(COPASI.CVersion.VERSION.getVersion())"
diff --git a/COPASI-set_QWTPLOT3D_QT4.patch b/COPASI-set_QWTPLOT3D_QT4.patch
index eb9bb4d..ec950bd 100644
--- a/COPASI-set_QWTPLOT3D_QT4.patch
+++ b/COPASI-set_QWTPLOT3D_QT4.patch
@@ -1,6 +1,6 @@
--- CMakeModules/FindQwtplot3dQt4.orig.cmake 2015-06-17 07:55:18.000000000 +0200
+++ CMakeModules/FindQwtplot3dQt4.cmake 2015-06-23 18:16:42.954635914 +0200
-@@ -20,18 +20,17 @@
+@@ -20,19 +20,17 @@
/opt/csw/include # Blastwave
/opt/include
/usr/freeware/include
@@ -18,12 +18,13 @@
find_library(QWTPLOT3D_LIBRARY
- NAMES qwtplot3d-static
- qwtplot3d-qt4
+- qwtplot3d-qt5
- qwtplot3d
+ NAMES qwtplot3d-qt4
PATHS $ENV{QWTPLOT3D_DIR}/lib
$ENV{QWTPLOT3D_DIR}
~/Library/Frameworks
-@@ -43,6 +42,7 @@
+@@ -44,6 +42,7 @@
/opt/csw/lib # Blastwave
/opt/lib
/usr/freeware/lib64
@@ -31,4 +32,3 @@
NO_DEFAULT_PATH)
if (NOT QWTPLOT3D_LIBRARY)
-
diff --git a/COPASI-set_QWTPLOT3D_QT5.patch b/COPASI-set_QWTPLOT3D_QT5.patch
index 87797d0..730f361 100644
--- a/COPASI-set_QWTPLOT3D_QT5.patch
+++ b/COPASI-set_QWTPLOT3D_QT5.patch
@@ -14,8 +14,8 @@
/opt/include
/usr/freeware/include
- PATH_SUFFIXES qwtplot3d qwtplot3d-qt4
-+ @@qtplot3d_includedir@@
-+ PATH_SUFFIXES qwtplot3d-qt5
++ @@qtplot3d_includedir@@
++ PATH_SUFFIXES qwtplot3d-qt5
NO_DEFAULT_PATH)
if (NOT QWTPLOT3D_INCLUDE_DIR)
@@ -27,12 +27,12 @@
find_library(QWTPLOT3D_LIBRARY
- NAMES qwtplot3d-static
- qwtplot3d-qt4
-- qwtplot3d
+- qwtplot3d-qt5
+ NAMES qwtplot3d-qt5
+ qwtplot3d
PATHS $ENV{QWTPLOT3D_DIR}/lib
$ENV{QWTPLOT3D_DIR}
- ~/Library/Frameworks
-@@ -43,6 +42,7 @@
+@@ -44,6 +43,7 @@
/opt/csw/lib # Blastwave
/opt/lib
/usr/freeware/lib64
diff --git a/COPASI.spec b/COPASI.spec
index 9b92ba0..c547ac0 100644
--- a/COPASI.spec
+++ b/COPASI.spec
@@ -9,7 +9,7 @@
%endif
%endif
-%global buildid 170
+%global buildid 184
%global with_python2 1
%global with_python3 1
@@ -65,8 +65,8 @@
Name: COPASI
Summary: Biochemical network simulator
-Version: 4.22.%{buildid}
-Release: 7%{?dist}
+Version: 4.23.%{buildid}
+Release: 2%{?dist}
##Artistic 2.0 is main license
##GPLv2+ is related to a Mixed Source Licensing Scenario
@@ -101,6 +101,9 @@ BuildRequires: libkdeedu-static
BuildRequires: libsbml-devel
BuildRequires: libsedml-devel >= 1:0.4.3-3
BuildRequires: libnuml-devel
+BuildRequires: libCombine-static
+BuildRequires: zipper-devel
+BuildRequires: minizip-devel
BuildRequires: libsbw-devel
BuildRequires: raptor-devel
BuildRequires: mesa-libGL-devel
@@ -125,7 +128,7 @@ BuildRequires: ImageMagick
BuildRequires: libappstream-glib
Requires: %{name}-data = %{version}-%{release}
-Requires: libsedml >= 1:0.4.3-3
+Requires: libsedml%{?_isa} >= 1:0.4.3-3
##This patch sets libraries' installation paths
Patch0: %{name}-fix_install_libpaths.patch
@@ -244,7 +247,7 @@ develop applications with COPASI Perl bindings.
%package -n R-%{octpkg}
Summary: %{name} R Bindings
BuildRequires: R-devel, R-core-devel, tex(latex)
-Requires: R-core
+Requires: R-core%{?_isa}
%description -n R-%{octpkg}
This package provides the libraries to
develop applications with COPASI R bindings.
@@ -360,12 +363,14 @@ export INCBLAS=%{_includedir}
-DQWT_VERSION_STRING:STRING=6.1.3 \
%endif
%if 0%{?with_qt4}
+ -DSELECT_QT=Qt4 \
-DQT_QMAKE_EXECUTABLE:FILEPATH=%{_bindir}/qmake-qt4 \
-DQWT_VERSION_STRING:STRING=5.2.2 \
-DQWT_LIBRARY:FILEPATH=%{_qt4_libdir}/libqwt5-qt4.so \
-DQWT_INCLUDE_DIR:PATH=%{_qt4_headerdir}/qwt5-qt4 \
%endif
%if 0%{?with_qt5}
+ -DSELECT_QT=Qt5 \
-DQT_QMAKE_EXECUTABLE:FILEPATH=%{_bindir}/qmake-qt5 \
-DQWT_VERSION_STRING:STRING=6.1.3 \
-DQWT_LIBRARY:FILEPATH=%{_qt5_libdir}/libqwt-qt5.so \
@@ -381,19 +386,16 @@ export INCBLAS=%{_includedir}
-DBLAS_blas_LIBRARY:FILEPATH=%{_libdir}/$LIBBLAS
-DLAPACK_lapack_LIBRARY:FILEPATH=%{_libdir}/$LIBLAPACK -DCLAPACK_INCLUDE_DIR:PATH=$INCBLAS
\
-DENABLE_FLEX_BISON:BOOL=ON -DENABLE_COPASI_PARAMETERFITTING_RESIDUAL_SCALING:BOOL=ON \
-DENABLE_WITH_MERGEMODEL:BOOL=ON -DENABLE_USE_MATH_CONTAINER:BOOL=ON \
- -DLIBSBML_INCLUDE_DIR:PATH=%{_includedir}/sbml -DF2C_INCLUDE_DIR:PATH=%{_includedir} \
+ -DLIBSBML_INCLUDE_DIR:PATH=%{_includedir}/sbml -DLIBSBML_SHARED:BOOL=ON
-DLIBSBML_LIBRARY:FILEPATH=%{_libdir}/libsbml.so \
+ -DF2C_INCLUDE_DIR:PATH=%{_includedir} \
-DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DENABLE_GPROF:BOOL=OFF \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE -DCMAKE_COLOR_MAKEFILE:BOOL=ON \
-DENABLE_FLEX_BISON:BOOL=ON -DBISON_EXECUTABLE:FILEPATH=%{_bindir}/bison \
- -DPREFER_STATIC:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=YES ..
+ -DPREFER_STATIC:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=YES
-DCombine-static_DIR:PATH=%{_libdir}/cmake ..
##'Parallel make' breaks builds
-%ifarch s390x %{arm}
make -j1
-%else
-make -j4
-%endif
popd
## ----> Move to build2 directory ##
@@ -448,7 +450,8 @@ export INCBLAS=%{_includedir}
-DBLAS_blas_LIBRARY:FILEPATH=%{_libdir}/$LIBBLAS
-DLAPACK_lapack_LIBRARY:FILEPATH=%{_libdir}/$LIBLAPACK -DCLAPACK_INCLUDE_DIR:PATH=$INCBLAS
\
-DENABLE_FLEX_BISON:BOOL=ON -DENABLE_COPASI_PARAMETERFITTING_RESIDUAL_SCALING:BOOL=ON \
-DENABLE_WITH_MERGEMODEL:BOOL=ON -DENABLE_USE_MATH_CONTAINER:BOOL=ON \
- -DLIBSBML_INCLUDE_DIR:PATH=%{_includedir}/sbml -DF2C_INCLUDE_DIR:PATH=%{_includedir} \
+ -DLIBSBML_INCLUDE_DIR:PATH=%{_includedir}/sbml -DLIBSBML_SHARED:BOOL=ON
-DLIBSBML_LIBRARY:FILEPATH=%{_libdir}/libsbml.so \
+ -DF2C_INCLUDE_DIR:PATH=%{_includedir} \
-DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DENABLE_GPROF:BOOL=OFF \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE -DCMAKE_COLOR_MAKEFILE:BOOL=ON \
@@ -606,6 +609,15 @@ appstream-util validate-relax --nonet
$RPM_BUILD_ROOT%{_datadir}/metainfo/*.appd
%{_datadir}/copasi/doc/
%changelog
+* Sun Apr 29 2018 Antonio Trande <sagitterATfedoraproject.org> - 4.23.184-2
+- Now built with Qt4
+- Do not use parallel Make jobs
+
+* Sun Apr 29 2018 Antonio Trande <sagitterATfedoraproject.org> - 4.23.184-1
+- Update to version 4.23 -build 184
+- Add libCombine, zipper, minizip dependencies
+- Build with Qt5
+
* Thu Feb 15 2018 Antonio Trande <sagitterATfedoraproject.org> - 4.22.170-7
- Rebuild for libsbml-5.16.0
- Disable Octave binding on ARM ('virtual memory exhausted' issue)
diff --git a/sources b/sources
index 225b2d0..c707395 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (COPASI-Build-170.tar.gz) =
086d8cf4178e55b260787e9c02c9c253edfd07878b5c67f6d757f87bb0f26dadaeb2fdf7c61093eb2f7dab1894525217bec8e91cf06ce725b1958cce350f414d
+SHA512 (COPASI-Build-184.tar.gz) =
d63f0081b62dd451de469b9450d7a8fbcf49cf5a0387947798ea7cb10a7ece39b3a4fe3e76b04d0d2ec15605d2636e4579f51b1b551870512602885e92e978d1
commit a47f7d4dd18ea6f365be0908aef3b4c0e87e6b37
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Feb 16 12:45:08 2018 +0100
Disable Octave binding on ARM ('virtual memory exhausted' issue)
diff --git a/COPASI.spec b/COPASI.spec
index cf87eca..9b92ba0 100644
--- a/COPASI.spec
+++ b/COPASI.spec
@@ -20,7 +20,8 @@
%global with_java 1
%endif
-%ifarch s390 s390x
+# Disable Octave binding on ARM ('virtual memory exhausted' issue)
+%ifarch s390 s390x %{arm}
%global with_octave 0
%else
%global with_octave 1
@@ -607,6 +608,7 @@ appstream-util validate-relax --nonet
$RPM_BUILD_ROOT%{_datadir}/metainfo/*.appd
%changelog
* Thu Feb 15 2018 Antonio Trande <sagitterATfedoraproject.org> - 4.22.170-7
- Rebuild for libsbml-5.16.0
+- Disable Octave binding on ARM ('virtual memory exhausted' issue)
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
4.22.170-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit 14b4b758cecf588b16402858be0c8c79a4347405
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Feb 15 18:22:48 2018 +0100
Use Make job-1 on arm
diff --git a/COPASI.spec b/COPASI.spec
index 3487a04..cf87eca 100644
--- a/COPASI.spec
+++ b/COPASI.spec
@@ -388,7 +388,7 @@ export INCBLAS=%{_includedir}
-DPREFER_STATIC:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=YES ..
##'Parallel make' breaks builds
-%ifarch s390x
+%ifarch s390x %{arm}
make -j1
%else
make -j4