[ascend] Fixed Graphviz 'cgraph' support (svn4695).

Antonio Trande sagitter at fedoraproject.org
Thu Jul 10 16:01:59 UTC 2014


commit 13e9ae02ea28d929a9fce3955b738f35615a92d1
Author: sagitter <anto.trande at gmail.com>
Date:   Thu Jul 10 18:02:00 2014 +0200

    Fixed Graphviz 'cgraph' support (svn4695).

 .gitignore             |    1 +
 ascend-swigcheck.patch |   19 -------------------
 ascend.spec            |   21 +++++++++++++--------
 sources                |    2 +-
 4 files changed, 15 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 66e69a8..179bc41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /ascend-svn4638.tar.gz
 /ascend-svn4677.tar.gz
+/ascend-svn4695.tar.gz
diff --git a/ascend.spec b/ascend.spec
index 6dcc23d..c61065d 100644
--- a/ascend.spec
+++ b/ascend.spec
@@ -12,14 +12,14 @@
 Name:		ascend
 Summary:	ASCEND modelling environment
 Version:	0.9.8
-Release:	8.20140429svn4677%{?dist}
+Release:	10.20140710svn4695%{?dist}
 License:	GPLv2+
 URL:		http://ascend4.org/
 
-## Source archive from svn #4677; obtained by:
+## Source archive from svn #4695; obtained by:
 ## svn co svn://ascend4.org/code/trunk ascend
-## tar -czvf  ascend-svn4677.tar.gz ascend
-Source0: %{name}-svn4677.tar.gz
+## tar -czvf  ascend-svn4695.tar.gz ascend
+Source0: %{name}-svn4695.tar.gz
 
 ##Fix building optimization flags 
 Patch0:  %{name}-optflags.patch
@@ -34,9 +34,6 @@ Patch2:  %{name}-libpaths.patch
 ##http://bugs.ascend4.org/view.php?id=559
 Patch3:  %{name}-idasolver.patch 
 
-##This patch fixes checking of minimal swig version
-Patch4:  %{name}-swigcheck.patch
-         
 
 #------ build dependencies -------
 BuildRequires: scons >= 0.96.92
@@ -48,6 +45,7 @@ BuildRequires: blas-devel
 BuildRequires: sundials-devel >= 2.4.0
 BuildRequires: coin-or-Ipopt-devel >= 3.10
 BuildRequires: MUMPS-devel
+BuildRequires: MUMPS-openmpi-devel
 BuildRequires: graphviz-devel
 BuildRequires: python2-devel
 BuildRequires: desktop-file-utils
@@ -68,6 +66,7 @@ Requires: gtksourceview3
 
 ##ascend needs these explicit dependencies
 Requires: MUMPS%{?_isa}
+Requires: MUMPS-openmpi%{?_isa}
 Requires: coin-or-Ipopt%{?_isa} >= 3.10
 Requires: graphviz%{?_isa}
 
@@ -139,7 +138,6 @@ Files have 5 extensions:
 %patch1 -p0
 %patch2 -p0
 %patch3 -p0
-%patch4 -p0
 
 sed -e 's|@@lib@@|%{_lib}|g' -i SConstruct
 sed -e 's|@@libdir@@|%{_libdir}|g' -i SConstruct
@@ -394,6 +392,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #%%doc doc/book.pdf
 
 %changelog
+* Thu Jul 10 2014 Antonio Trande <sagitter at fedoraproject.org> 0.9.8-10.20140710svn4695
+- Update to new commit (4695)
+- Fixed Graphviz 'cgraph' support 
+
+* Tue Jun 24 2014 Antonio Trande <sagitter at fedoraproject.org> 0.9.8-9.20140623svn4683
+- Update to new commit (4683)
+
 * Fri Jun 20 2014 Antonio Trande <sagitter at fedoraproject.org> 0.9.8-8.20140429svn4677
 - Added explicit dependencies (MUMPS, coin-or-Ipopt, graphviz)
 
diff --git a/sources b/sources
index 25c70e7..bb8918f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb3d1c8cea0beba12a5622ba735693a5  ascend-svn4677.tar.gz
+8a80a64c753b0f5c26e92172e38812d6  ascend-svn4695.tar.gz


More information about the scm-commits mailing list