From cbda30d176bb5c2e71e93a4ef59fcc12dd656ebc Mon Sep 17 00:00:00 2001 From: sagitter Date: Nov 03 2016 14:04:58 +0000 Subject: Update to build-131 --- diff --git a/.gitignore b/.gitignore index 1d33088..903828c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /COPASI-31a97864d72e40f94cf1230af5f593543d1e23c7.zip /COPASI-Build-123.tar.gz /COPASI-Build-128.tar.gz +/COPASI-Build-131.tar.gz diff --git a/COPASI-correct_yacc_file.patch b/COPASI-correct_yacc_file.patch deleted file mode 100644 index ec3114a..0000000 --- a/COPASI-correct_yacc_file.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 8a5f455f5ec943338f2d03889fb785a971f3d0ad Mon Sep 17 00:00:00 2001 -From: Stefan Hoops -Date: Fri, 14 Oct 2016 08:45:25 -0400 -Subject: [PATCH] Fixed Bug 2316. Corrected the yacc source file. - ---- - copasi/function/CEvaluationParser.ypp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git copasi/function/CEvaluationParser.ypp copasi/function/CEvaluationParser.ypp -index 3864f2d..c92f2bc 100644 ---- copasi/function/CEvaluationParser.ypp -+++ copasi/function/CEvaluationParser.ypp -@@ -25,7 +25,7 @@ - - void setBooleanRequired(CEvaluationNode * pNode, const bool & booleanRequired) - { -- if (CEvaluationNode::type(pNode->getType()) == CEvaluationNode::CALL) -+ if (pNode->mainType() == CEvaluationNode::T_CALL) - { - static_cast(pNode)->setBooleanRequired(booleanRequired); - } diff --git a/COPASI.spec b/COPASI.spec index 5f90259..9cccc13 100644 --- a/COPASI.spec +++ b/COPASI.spec @@ -1,6 +1,6 @@ -%global checkout de9275fbcdcdcf437e458c2c7eb93a10c2ff4778 -%global date 20161013 -%global buildid 128 +%global checkout bdf5cd0607ed07980b8e755c8aa9a9d1faabec63 +%global date 20161102 +%global buildid 131 %global with_python2 1 %global with_python3 1 @@ -41,7 +41,7 @@ Name: COPASI Summary: Biochemical network simulator Version: 4.17 -Release: 0.10.%{date}git%(echo %{checkout} | cut -c-6)%{?dist} +Release: 0.11.%{date}git%(echo %{checkout} | cut -c-6)%{?dist} ##Artistic 2.0 is main license ##GPLv2+ is related to a Mixed Source Licensing Scenario @@ -103,9 +103,6 @@ Patch2: %{name}-set_QWTPLOT3D_QT4.patch ##This patch fixes executable permissions of CopasiSE and CopasiUI Patch4: %{name}-fix_exe_permissions.patch -##See https://github.com/copasi/COPASI/commit/8a5f455f5ec943338f2d03889fb785a971f3d0ad -Patch5: COPASI-correct_yacc_file.patch - %description COPASI is a software application for simulation and analysis of biochemical networks and their dynamics. @@ -267,7 +264,6 @@ sed -e 's|@@qtplot3d_libdir@@|%{_libdir}|g' -i CMakeModules/FindQwtplot3dQt4.cma %endif %patch4 -p0 -%patch5 -p0 %build mkdir -p build && pushd build @@ -542,6 +538,10 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/*.appda %{_datadir}/copasi/doc/ %changelog +* Wed Nov 02 2016 Antonio Trande 4.17-0.11.20161102gitbdf5cd +- Update to build-131 +- Drop old patch + * Mon Oct 17 2016 Antonio Trande 4.17-0.10.20161013gitde9275 - Update to build-128 diff --git a/sources b/sources index 8c3a2ac..9996307 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1bc48ae9b84db86d57a03d3aa803c2e COPASI-Build-128.tar.gz +fdb388cc855f5e204efc6625aeb57145 COPASI-Build-131.tar.gz