[ascend] Changed Ipopt and MUMPS minimal requests.
Antonio Trande
sagitter at fedoraproject.org
Tue Oct 14 10:19:53 UTC 2014
commit ae798069fa752da02e2cc350764e1479b2627db3
Author: sagitter <anto.trande at gmail.com>
Date: Tue Oct 14 12:19:31 2014 +0200
Changed Ipopt and MUMPS minimal requests.
ascend-libpaths.patch | 119 ++-----------------------------------------------
ascend-optflags.patch | 2 +-
ascend.spec | 15 ++++---
3 files changed, 14 insertions(+), 122 deletions(-)
---
diff --git a/ascend-libpaths.patch b/ascend-libpaths.patch
index dab1b2f..6ce3c20 100644
--- a/ascend-libpaths.patch
+++ b/ascend-libpaths.patch
@@ -1,117 +1,6 @@
--- SConstruct.orig 2014-02-11 21:18:40.000000000 +0100
+++ SConstruct 2014-02-22 17:49:01.618492745 +0100
-@@ -36,7 +36,7 @@
- soname_major = "." + soname_major_int
- default_install_prefix = '/usr/local'
- default_install_bin = "$INSTALL_PREFIX/bin"
--default_install_lib = "$INSTALL_PREFIX/lib"
-+default_install_lib = "@@libdir@@"
- default_install_models = "$INSTALL_LIB/ascend/models"
- default_install_solvers = "$INSTALL_LIB/ascend/solvers"
- default_install_assets = "$INSTALL_ASCDATA/glade/"
-@@ -45,15 +45,19 @@
- default_install_python = distutils.sysconfig.get_python_lib(plat_specific=1)
- default_install_python_ascend = "$INSTALL_PYTHON/ascend"
- default_tcl = '/usr'
--default_tcl_libpath = "$TCL/lib"
-+default_tcl_libpath = "@@libdir@@"
- default_tcl_cpppath = "$TCL/include"
- default_conopt_envvar="CONOPT_PATH"
- default_with_graphviz = True
-+default_graphviz_libpath="$DEFAULT_PREFIX/@@lib@@"
-+default_graphviz_cpppath="$DEFAULT_PREFIX/include/graphviz"
- default_tcl_lib = "tcl8.5"
- default_tk_lib = "tk8.5"
--default_tktable_lib = "Tktable2.9"
-+default_tktable_lib = "@@libdir@@/tcl8.5"
- default_ida_prefix="$DEFAULT_PREFIX"
--default_ipopt_libpath = "$IPOPT_PREFIX/lib"
-+default_ida_cpppatch="$DEFAULT_PREFIX/include"
-+default_sundials_cpppath="$DEFAULT_PREFIX/include"
-+default_ipopt_libpath = "$DEFAULT_PREFIX/@@lib@@"
- default_ipopt_dll = ["$DEFAULT_PREFIX/bin/%s.dll"%i for i in ["libgfortran$MINGW64SUFF-3", "libstdc++$MINGW64SUFF-6","libquadmath$MINGW64SUFF-0","libgcc_s$MINGW64EXCPT$MINGW64SUFF-1"]]+[None] # should be five here
- default_ipopt_libs = ["$F2C_LIB","blas","lapack","pthread","ipopt"]
- default_conopt_prefix="$DEFAULT_PREFIX"
-@@ -61,7 +65,7 @@
- default_conopt_cpppath="$CONOPT_PREFIX"
- default_conopt_dlpath="$CONOPT_PREFIX"
- default_prefix="/usr"
--default_libpath="$DEFAULT_PREFIX/lib"
-+default_libpath="$DEFAULT_PREFIX/@@lib@@"
- default_cpppath="$DEFAULT_PREFIX/include"
- default_f2c_lib="gfortran"
- default_swig="swig"
-@@ -181,10 +185,10 @@
-
- # here's the folklore we know.
- if os.path.exists("/etc/debian_version"):
-- default_tcl_cpppath = "/usr/include/tcl8.4"
-- default_tcl_lib = "tcl8.4"
-- default_tk_lib = "tk8.4"
-- default_tktable_lib = "Tktable2.8"
-+ default_tcl_cpppath = "/usr/include"
-+ default_tcl_lib = "tcl8.5"
-+ default_tk_lib = "tk8.5"
-+ default_tktable_lib = "@@libdir@@"
-
- if os.path.exists("/etc/SuSE-release"):
- default_tcl_cpppath = "/usr/include"
-@@ -205,12 +209,12 @@
- default_tcl_lib = "tcl8.5"
- default_tk_lib = "tk8.5"
- default_tktable_lib = "Tktable2.9"
-- default_tcl_cpppath = "/usr/include/tcl8.5"
-+ default_tcl_cpppath = "/usr/include"
- if not os.path.exists(default_tcl_cpppath):
- default_tcl_lib = "tcl8.4"
- default_tk_lib = "tk8.4"
- default_tktable_lib = "Tktable2.9"
-- default_tcl_cpppath = "/usr/include/tcl8.4"
-+ default_tcl_cpppath = "/usr/include"
-
- # centos 5
- if os.path.exists("/etc/redhat-release"):
-@@ -221,7 +225,7 @@
- else:
- default_tcl_libpath = "/usr/lib"
- default_tk_lib = "tk"
-- default_tktable_lib = "Tktable2.9"
-+ default_tktable_lib = "@@libdir@@"
-
-
- default_absolute_paths = True
-@@ -408,6 +412,30 @@
- ,"$CUNIT_PREFIX/lib"
- ))
-
-+#------ graphviz --------
-+
-+# Where are the graphviz includes?
-+vars.Add(PackageVariable('GRAPHVIZ_CPPPATH'
-+ ,"Where are your graphviz include files?"
-+ ,"$DEFAULT_PREFIX/include/graphviz"
-+))
-+
-+vars.Add('GRAPHVIZ_CPPPATH'
-+ ,"Where is your graphviz.h?"
-+ ,default_graphviz_cpppath
-+)
-+
-+# Where are the graphviz libraries?
-+vars.Add(PackageVariable('GRAPHVIZ_LIBPATH'
-+ ,"Where are your graphviz libraries?"
-+ ,default_graphviz_libpath
-+))
-+
-+vars.Add('GRAPHVIZ_LIBPATH'
-+ ,"Where are your graphviz libraries?"
-+ ,default_graphviz_libpath
-+)
-+
- # ----- conopt-----
-
- vars.Add(PackageVariable("CONOPT_PREFIX"
-@@ -1601,8 +1629,8 @@
+@@ -1629,8 +1657,8 @@
# IDA test
sundials_version_major_required = 2
@@ -122,7 +11,7 @@
sundials_version_text = """
#include <sundials/sundials_config.h>
-@@ -1614,16 +1642,16 @@
+@@ -1642,16 +1670,16 @@
"""
ida_test_text = """
@@ -144,7 +33,7 @@
#endif
int main(){
void *ida_mem;
-@@ -1647,8 +1675,8 @@
+@@ -1675,8 +1703,8 @@
context.env['SUNDIALS_VERSION_MAJOR'] = major
context.env['SUNDIALS_VERSION_MINOR'] = minor
if major != sundials_version_major_required \
@@ -155,7 +44,7 @@
context.Result(output+" (bad version)")
# bad version
return 0
-@@ -1675,12 +1703,12 @@
+@@ -1703,12 +1731,12 @@
])
context.env['SUNDIALS_CPPPATH_EXTRA']=[]
diff --git a/ascend-optflags.patch b/ascend-optflags.patch
index 8527673..7c024e8 100644
--- a/ascend-optflags.patch
+++ b/ascend-optflags.patch
@@ -1,6 +1,6 @@
--- SConstruct.orig 2013-12-07 10:40:31.395778000 +0100
+++ SConstruct 2013-12-07 10:57:37.834091322 +0100
-@@ -2607,10 +2607,13 @@
+@@ -2637,10 +2637,13 @@
env.AppendUnique(CPPPATH=['#'])
if env['DEBUG']:
diff --git a/ascend.spec b/ascend.spec
index 694edc0..e375989 100644
--- a/ascend.spec
+++ b/ascend.spec
@@ -12,7 +12,7 @@
Name: ascend
Summary: ASCEND modelling environment
Version: 0.9.8
-Release: 14.20140710svn4695%{?dist}
+Release: 15.20140710svn4695%{?dist}
License: GPLv2+
URL: http://ascend4.org/
@@ -43,8 +43,8 @@ BuildRequires: swig >= 1.3.24
BuildRequires: gcc-gfortran >= 4
BuildRequires: blas-devel
BuildRequires: sundials-devel >= 2.4.0
-BuildRequires: coin-or-Ipopt-devel
-BuildRequires: MUMPS-devel >= 4.10.0-17
+BuildRequires: coin-or-Ipopt-devel >= 3.11.9-1
+BuildRequires: MUMPS-devel >= 4.10.0-21
BuildRequires: graphviz-devel
BuildRequires: python2-devel
BuildRequires: desktop-file-utils
@@ -63,8 +63,8 @@ Requires: ipython
# syntax highlighting for gedit
Requires: gtksourceview3
-Requires: coin-or-Ipopt%{?_isa}
-Requires: MUMPS%{?_isa}
+Requires: coin-or-Ipopt%{?_isa} >= 3.11.9-1
+Requires: MUMPS%{?_isa} >= 4.10.0-21
Requires: graphviz%{?_isa}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -162,7 +162,7 @@ scons %{?_smp_mflags} \
WITH_GRAPHVIZ=yes \
IPOPT_CPPPATH=%{_includedir}/coin \
IPOPT_LIBPATH=%{_libdir} \
- IPOPT_LIBS="-L%{_libdir} -lipopt" \
+ IPOPT_LIBS="-L%{_libdir} -lipopt -ldmumps -lblas -llapack" \
WITH_CUNIT=yes \
CUNIT_CPPPATH=%{_includedir}/CUnit \
CUNIT_LIBPATH=%{_libdir} \
@@ -389,6 +389,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#%%doc doc/book.pdf
%changelog
+* Fri Sep 05 2014 Antonio Trande <sagitter at fedoraproject.org> 0.9.8-15.20140710svn4695
+- Changed Ipopt and MUMPS minimal requests
+
* Fri Sep 05 2014 Antonio Trande <sagitter at fedoraproject.org> 0.9.8-14.20140710svn4695
- Rebuild after bz#1135728 fixing
More information about the scm-commits
mailing list