diff --git a/.gitignore b/.gitignore index b8e69d4..abb86d3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /COPASI-3bc4e909636d7ec353b683819c5a6bbc209838aa.zip /COPASI-7b0f05cea47a8cc712e78672c325096e3f6c5bd4.zip +/COPASI-31a97864d72e40f94cf1230af5f593543d1e23c7.zip diff --git a/COPASI.spec b/COPASI.spec index 3e81387..4da4f33 100644 --- a/COPASI.spec +++ b/COPASI.spec @@ -1,5 +1,5 @@ -%global checkout 7b0f05cea47a8cc712e78672c325096e3f6c5bd4 -%global date 20160203 +%global checkout 31a97864d72e40f94cf1230af5f593543d1e23c7 +%global date 20160720 %global with_python2 1 %global with_python3 1 @@ -39,7 +39,7 @@ Name: COPASI Summary: Biochemical network simulator Version: 4.17 -Release: 0.5.%{date}git%(echo %{checkout} | cut -c-6)%{?dist} +Release: 0.6.%{date}git%(echo %{checkout} | cut -c-6)%{?dist} ##Artistic 2.0 is main license ##GPLv2+ is related to a Mixed Source Licensing Scenario @@ -265,11 +265,7 @@ sed -e 's|@@qtplot3d_libdir@@|%{_libdir}|g' -i CMakeModules/FindQwtplot3dQt4.cma %build mkdir -p build && pushd build -%if 0%{?fedora} < 23 -export CXXFLAGS="-DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} -Wl,-z,relro -Wl,-z,now -DCOPASI_OVERWRITE_USE_LAPACK -DNO_BLAS_WRAP" -%else export CXXFLAGS="-DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} -Wl,-z,relro -fPIC -pie -Wl,-z,now -DCOPASI_OVERWRITE_USE_LAPACK -DNO_BLAS_WRAP" -%endif %cmake -Wno-dev \ %if 0%{?with_python2} -DENABLE_PYTHON:BOOL=ON \ @@ -298,20 +294,13 @@ export CXXFLAGS="-DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} -Wl,-z,relro - -DENABLE_CSHARP:BOOL=ON \ -DBUILD_CS_EXAMPLES:BOOL=OFF \ %endif -%if 0%{?fedora} > 22 -DCSHARP_COMPILER:FILEPATH=%{_bindir}/mcs \ -%endif %if 0%{?with_qwt6} -DEXTRA_MOC_OPTIONS="-DQWT_VERSION=0x60102" \ %endif -DBUILD_GUI:BOOL=ON -DBUILD_COPASISBW:BOOL=ON --DENABLE_MML:BOOL=ON -DENABLE_USE_SBMLUNIT=ON \ -%if 0%{?fedora} < 23 - -DCMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING="%{__global_ldflags} -Wl,-z,now -pthread" \ - -DCMAKE_EXE_LINKER_FLAGS:STRING="%{__global_ldflags} -Wl,-z,relro -Wl,-z,now" \ -%else -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" \ -%endif -DMML_INCLUDE_DIR:PATH=%{_kde4_includedir}/libkdeedu/qtmml -DMML_LIBRARY:FILEPATH=%{_kde4_libdir}/libqtmmlwidget.a \ -DENABLE_SBW_INTEGRATION=ON -DBUILD_CXX_EXAMPLES=ON \ -DENABLE_COPASI_BANDED_GRAPH:BOOL=ON -DENABLE_COPASI_SEDML:BOOL=ON \ @@ -361,8 +350,6 @@ export CXXFLAGS="-DF2C_INTEGER=int -DF2C_LOGICAL=long %{optflags} -Wl,-z,relro - -DBUILD_CS_EXAMPLES:BOOL=OFF \ -DCSHARP_COMPILER:FILEPATH=%{_bindir}/mcs \ %endif -%if 0%{?fedora} > 22 -%endif -DBUILD_GUI:BOOL=OFF -DENABLE_MML:BOOL=OFF -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" \ @@ -462,7 +449,9 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml < http://copasi.org/ - https://sagitter.fedorapeople.org/copasi.png + + https://sagitter.fedorapeople.org/copasi.png + support_at_copasi.org @@ -551,6 +540,9 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/*.appda %{_datadir}/copasi/doc/ %changelog +* Wed Jul 27 2016 Antonio Trande 4.17-0.6.20160720git31a978 +- Update to build-119 + * Tue Jul 19 2016 Fedora Release Engineering - 4.17-0.5.20160203git7b0f05 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages diff --git a/sources b/sources index 2de51bd..2de7926 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6169caff5b738b7831b2580c7cc6f0be COPASI-7b0f05cea47a8cc712e78672c325096e3f6c5bd4.zip +315bb8a803f74e6f253dadc9bcc057da COPASI-31a97864d72e40f94cf1230af5f593543d1e23c7.zip