diff --git a/COPASI.spec b/COPASI.spec index 58cb03d..7d9f91c 100644 --- a/COPASI.spec +++ b/COPASI.spec @@ -35,12 +35,6 @@ Obsoletes: octave-%{octpkg} < 0:4.23.184-2 ##Use QWT6? (Experimental) %global with_qwt6 0 -# Use Qt4 -%global with_qt4 0 - -# Use Qt5 -%global with_qt5 1 - %if 0%{?with_octave} # Exclude .oct files from provides %global __provides_exclude_from ^%{octpkglibdir}/.*\\.oct$ @@ -62,7 +56,7 @@ Obsoletes: octave-%{octpkg} < 0:4.23.184-2 Name: COPASI Summary: Biochemical network simulator Version: 4.23.%{buildid} -Release: 6%{?dist} +Release: 7%{?dist} ##Artistic 2.0 is main license ##GPLv2+ is related to a Mixed Source Licensing Scenario @@ -80,20 +74,11 @@ Source1: %{name}.appdata.xml %if 0%{?with_qwt6} BuildRequires: qwt-devel %endif -%if 0%{?with_qt4} -BuildRequires: qwt5-qt4-devel -BuildRequires: qwtplot3d-qt4-devel -BuildRequires: qt-devel -BuildRequires: qt-webkit-devel -BuildRequires: libmml-qt4-devel -%endif -%if 0%{?with_qt5} BuildRequires: qwt-qt5-devel BuildRequires: qwtplot3d-qt5-devel >= 0.3.1a-4 BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtwebkit-devel BuildRequires: libmml-qt5-devel -%endif BuildRequires: freeglut-devel BuildRequires: libsbml-devel BuildRequires: libsedml-devel >= 1:0.4.3-3 @@ -292,17 +277,6 @@ done ##Set Qwt libdir sed -e 's|@@libdir@@|%{_libdir}|g' -i CMakeModules/FindQwtQt4.cmake -%if 0%{?with_qt4} -%patch2 -p0 -####Set QTPLOT3D-QT4 paths -sed -e 's|@@qtplot3d_includedir@@|%{_includedir}|g' -i CMakeModules/FindQwtplot3dQt4.cmake -sed -e 's|@@qtplot3d_libdir@@|%{_libdir}|g' -i CMakeModules/FindQwtplot3dQt4.cmake - -##Set QtMmlQt4 paths -sed -e 's|@@_libmml_includedir@@|%{_qt4_headerdir}/libmml-qt4|g' -i CMakeModules/FindQtMmlQt4.cmake -sed -e 's|@@_libmml_libdir@@|%{_qt4_libdir}|g' -i CMakeModules/FindQtMmlQt4.cmake -%endif -%if 0%{?with_qt5} %patch5 -p0 ####Set QTPLOT3D-QT5 paths sed -e 's|@@qtplot3d_includedir@@|%{_qt5_headerdir}/qwtplot3d-qt5|g' -i CMakeModules/FindQwtplot3dQt4.cmake @@ -311,7 +285,6 @@ sed -e 's|@@qtplot3d_libdir@@|%{_qt5_libdir}|g' -i CMakeModules/FindQwtplot3dQt4 ##Set QtMmlQt5 paths sed -e 's|@@_libmml_includedir@@|%{_qt5_headerdir}/libmml-qt5|g' -i CMakeModules/FindQtMmlQt4.cmake sed -e 's|@@_libmml_libdir@@|%{_qt5_libdir}|g' -i CMakeModules/FindQtMmlQt4.cmake -%endif %build mkdir -p build && pushd build @@ -360,29 +333,15 @@ export INCBLAS=%{_includedir} %if 0%{?with_qwt6} -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 \ -DQWT_INCLUDE_DIR:PATH=%{_qt5_headerdir}/qwt \ -%endif -DBUILD_GUI:BOOL=ON -DBUILD_COPASISBW:BOOL=ON --DENABLE_MML:BOOL=ON -DENABLE_USE_SBMLUNIT=ON \ -DCMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now -pthread" \ -DCMAKE_EXE_LINKER_FLAGS:STRING="%{__global_ldflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now" \ -%if 0%{?with_qt5} -DMML_INCLUDE_DIR:PATH=%{_qt5_headerdir}/libmml-qt5 -DMML_LIBRARY:FILEPATH=%{_qt5_libdir}/libmml.so \ -%endif -%if 0%{?with_qt4} - -DMML_INCLUDE_DIR:PATH=%{_qt4_headerdir}/libmml-qt4 -DMML_LIBRARY:FILEPATH=%{_qt4_libdir}/libmml-qt4.so \ -%endif -DENABLE_SBW_INTEGRATION=ON -DBUILD_CXX_EXAMPLES=ON \ -DENABLE_COPASI_BANDED_GRAPH:BOOL=ON -DENABLE_COPASI_SEDML:BOOL=ON \ -DENABLE_COPASI_NONLIN_DYN_OSCILLATION:BOOL=ON -DENABLE_COPASI_EXTUNIT:BOOL=ON \ @@ -613,6 +572,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/*.appd %{_datadir}/copasi/doc/ %changelog +* Thu May 31 2018 Antonio Trande - 4.23.184-7 +- Use always Qt5 + * Fri May 18 2018 Antonio Trande - 4.23.184-6 - Fix Python interpreter