[python-cvxopt] Rebuild due to bz 712251. Enable the DSDP extension.

[Jerry James]

commit 127afa85e67fd4d964100b5ffd590578b45c19f3
Author: Jerry James <loganjerry at gmail.com>
Date:   Wed Jun 22 09:41:09 2011 -0600

    Rebuild due to bz 712251.
    Enable the DSDP extension.

 python-cvxopt-setup.patch |   13 +++++++++++--
 python-cvxopt.spec        |   11 +++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/python-cvxopt-setup.patch b/python-cvxopt-setup.patch
index d07c2bf..4601eb0 100644
--- a/python-cvxopt-setup.patch
+++ b/python-cvxopt-setup.patch
@@ -1,5 +1,5 @@
---- src/setup.py.orig	2011-05-19 15:57:27.442387011 -0600
-+++ src/setup.py	2011-05-19 15:57:53.788764551 -0600
+--- src/setup.py.orig	2010-09-15 22:55:00.000000000 -0600
++++ src/setup.py	2011-06-22 09:26:12.094390349 -0600
 @@ -46,14 +46,14 @@
  # optional modules
  
@@ -17,6 +17,15 @@
          include_dirs = [ FFTW_INC_DIR ],
          library_dirs = [ FFTW_LIB_DIR, ATLAS_LIB_DIR ],
          sources = ['C/fftw.c'] )
+@@ -67,7 +67,7 @@
+     extmods += [glpk];
+ 
+ if BUILD_DSDP:
+-    dsdp = Extension('dsdp', libraries = ['dsdp', 'blas', 'lapack'],
++    dsdp = Extension('dsdp', libraries = ['dsdp'],
+         include_dirs = [ DSDP_INC_DIR ],
+         library_dirs = [ DSDP_LIB_DIR, ATLAS_LIB_DIR ],
+         sources = ['C/dsdp.c'] )
 @@ -85,32 +85,27 @@
  else:    
      MACROS = []
diff --git a/python-cvxopt.spec b/python-cvxopt.spec
index c9ef00e..fb27dfe 100644
--- a/python-cvxopt.spec
+++ b/python-cvxopt.spec
@@ -1,6 +1,6 @@
 Name:           python-cvxopt
 Version:        1.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Python Package for Convex Optimization
 Group:          Development/Languages
 License:        GPLv3+
@@ -14,6 +14,7 @@ Patch0:         python-cvxopt-fixglpkinclude.patch
 Patch1:         python-cvxopt-setup.patch
 
 BuildRequires:  atlas-devel
+BuildRequires:  DSDP-devel
 BuildRequires:  fftw-devel
 BuildRequires:  glpk-devel
 BuildRequires:  gsl-devel
@@ -51,7 +52,7 @@ Example use of %{name}.
 %setup -q -n cvxopt-%{version}
 %patch0
 
-# Configure all optional modules (except for DSDP which isn't in Fedora)
+# Configure all optional modules
 sed -e "s#^ATLAS_LIB_DIR =.*#ATLAS_LIB_DIR = '%{_libdir}/atlas'#" \
     -e "s#^BUILD_GSL =.*#BUILD_GSL = 1#" \
     -e "s#^GSL_LIB_DIR =.*#GSL_LIB_DIR = '%{_libdir}'#" \
@@ -59,7 +60,9 @@ sed -e "s#^ATLAS_LIB_DIR =.*#ATLAS_LIB_DIR = '%{_libdir}/atlas'#" \
     -e "s#^FFTW_LIB_DIR =.*#FFTW_LIB_DIR = '%{_libdir}'#" \
     -e "s#^BUILD_GLPK =.*#BUILD_GLPK = 1#" \
     -e "s#^GLPK_LIB_DIR =.*#GLPK_LIB_DIR = '%{_libdir}'#" \
+    -e "s#^BUILD_DSDP =.*#BUILD_DSDP = 1#" \
     -e "s#^DSDP_LIB_DIR =.*#DSDP_LIB_DIR = '%{_libdir}'#" \
+    -e "s#^DSDP_INC_DIR =.*#DSDP_INC_DIR = '%{_includedir}/DSDP'#" \
     -i src/setup.py
 
 %patch1 -b .orig
@@ -101,6 +104,10 @@ cp -a examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
 
 
 %changelog
+* Wed Jun 22 2011 Jerry James <loganjerry at gmail.com> - 1.1.3-2
+- Rebuild due to bz 712251
+- Enable the DSDP extension
+
 * Thu May 19 2011 Jerry James <loganjerry at gmail.com> - 1.1.3-1
 - New upstream release (bz 700288)
 - Ensure linking against ATLAS BLAS instead of system BLAS