[python-cvxopt] New upstream release.
Jerry James
jjames at fedoraproject.org
Tue Jun 17 20:43:29 UTC 2014
commit 22d259ec55349e7865ebe45755eee4c7780dc59e
Author: Jerry James <jamesjer at betterlinux.com>
Date: Tue Jun 17 14:42:51 2014 -0600
New upstream release.
Drop upstreamed -fixglpkinclude and -glpk patches.
Use better URL for Source0.
Build documentation with python3.
Minor spec file cleanups.
.gitignore | 2 +-
python-cvxopt-fixglpkinclude.patch | 11 -
python-cvxopt-glpk.patch | 889 ------------------------------------
python-cvxopt-setup.patch | 20 +-
python-cvxopt.spec | 57 +--
sources | 2 +-
6 files changed, 37 insertions(+), 944 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f13d4dc..921240d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/1.1.6.tar.gz
+/cvxopt-1.1.7.tar.gz
diff --git a/python-cvxopt-setup.patch b/python-cvxopt-setup.patch
index 1a6146b..3db1ee7 100644
--- a/python-cvxopt-setup.patch
+++ b/python-cvxopt-setup.patch
@@ -1,7 +1,7 @@
---- setup.py.orig 2013-04-22 00:44:28.000000000 -0600
-+++ setup.py 2013-09-23 08:23:37.288245909 -0600
-@@ -2,11 +2,11 @@
- from glob import glob
+--- setup.py.orig 2014-06-04 10:54:07.000000000 -0600
++++ setup.py 2014-06-17 14:12:56.481039819 -0600
+@@ -7,11 +7,11 @@
+ import os
# Modifiy this if BLAS and LAPACK libraries are not in /usr/lib.
-BLAS_LIB_DIR = '/usr/lib'
@@ -15,7 +15,7 @@
BLAS_EXTRA_LINK_ARGS = []
# Set environment variable BLAS_NOUNDERSCORES=1 if your BLAS/LAPACK do
-@@ -15,7 +15,7 @@
+@@ -20,7 +20,7 @@
# Set to 1 if you are using the random number generators in the GNU
# Scientific Library.
@@ -24,7 +24,7 @@
# Directory containing libgsl (used only when BUILD_GSL = 1).
GSL_LIB_DIR = '/usr/lib'
-@@ -24,7 +24,7 @@
+@@ -29,7 +29,7 @@
GSL_INC_DIR = '/usr/include/gsl'
# Set to 1 if you are installing the fftw module.
@@ -33,7 +33,7 @@
# Directory containing libfftw3 (used only when BUILD_FFTW = 1).
FFTW_LIB_DIR = '/usr/lib'
-@@ -33,7 +33,7 @@
+@@ -38,7 +38,7 @@
FFTW_INC_DIR = '/usr/include'
# Set to 1 if you are installing the glpk module.
@@ -42,7 +42,7 @@
# Directory containing libglpk (used only when BUILD_GLPK = 1).
GLPK_LIB_DIR = '/usr/lib'
-@@ -42,13 +42,13 @@
+@@ -47,13 +47,13 @@
GLPK_INC_DIR = '/usr/include'
# Set to 1 if you are installing the DSDP module.
@@ -58,7 +58,7 @@
# No modifications should be needed below this line.
-@@ -112,20 +112,13 @@
+@@ -138,20 +138,13 @@
sources = ['src/C/lapack.c'] )
umfpack = Extension('umfpack',
@@ -82,7 +82,7 @@
# Build for int or long?
import sys
-@@ -133,30 +126,17 @@
+@@ -159,30 +152,17 @@
cholmod = Extension('cholmod',
library_dirs = [ BLAS_LIB_DIR ],
diff --git a/python-cvxopt.spec b/python-cvxopt.spec
index de0722e..3f24027 100644
--- a/python-cvxopt.spec
+++ b/python-cvxopt.spec
@@ -1,18 +1,16 @@
-Name: python-cvxopt
-Version: 1.1.6
-Release: 6%{?dist}
+%global pkgname cvxopt
+
+Name: python-%{pkgname}
+Version: 1.1.7
+Release: 1%{?dist}
Summary: A Python Package for Convex Optimization
Group: Development/Languages
License: GPLv3+
URL: http://cvxopt.org/
-Source0: https://github.com/cvxopt/cvxopt/archive/%{version}.tar.gz
-# Will submit patch0 to upstream ASAP
-Patch0: %{name}-fixglpkinclude.patch
+Source0: https://github.com/%{pkgname}/%{pkgname}/archive/%{version}/%{pkgname}-%{version}.tar.gz
# Use the system suitesparse instead of building one, and ensure the ATLAS BLAS
# library is used instead of the system BLAS.
-Patch1: %{name}-setup.patch
-# Sent upstream 31 Jul 2013. Move from obsolete glpk API to new API.
-Patch2: %{name}-glpk.patch
+Patch0: %{name}-setup.patch
BuildRequires: atlas-devel
BuildRequires: DSDP-devel
@@ -21,15 +19,13 @@ BuildRequires: glpk-devel
BuildRequires: gsl-devel
BuildRequires: python2-devel python3-devel
BuildRequires: python-setuptools python3-setuptools
-BuildRequires: python-sphinx
+BuildRequires: python3-sphinx
BuildRequires: suitesparse-devel
BuildRequires: tex(latex)
BuildRequires: tex(tex4ht.sty)
BuildRequires: tex(utf8x.def)
BuildRequires: texlive-dvipng
-%global __provides_exclude \\.so
-
%description
CVXOPT is a free software package for convex optimization based on
@@ -51,12 +47,12 @@ BuildArch: noarch
Example use of %{name}.
-%package -n python3-cvxopt
+%package -n python3-%{pkgname}
Summary: A Python3 Package for Convex Optimization
Group: Development/Languages
-%description -n python3-cvxopt
+%description -n python3-%{pkgname}
CVXOPT is a free software package for convex optimization based on
the Python programming language. Its main purpose is to make the
development of software for convex optimization applications
@@ -65,15 +61,13 @@ on the strengths of Python as a high-level programming language.
%prep
-%setup -q -n cvxopt-%{version}
+%setup -q -n %{pkgname}-%{version}
%patch0
-%patch1
-%patch2
# Fix library path
-if [ %{__isa_bits} = "64" ]; then
- sed -i "s|/usr/lib|%{_libdir}|" setup.py
-fi
+%if %{__isa_bits} == 64
+sed -i "s|/usr/lib|%{_libdir}|" setup.py
+%endif
# Remove internal copy of system library
rm -rf src/C/SuiteSparse*
@@ -81,9 +75,6 @@ rm -rf src/C/SuiteSparse*
# Remove useless executable bits
find examples -name \*.py -perm /0111 | xargs chmod a-x
-# Fix the version number in the documentation
-sed -i 's/1\.1\.5/%{version}/' doc/source/conf.py
-
# Make a copy so we can build for python3 as well
cp -a src src3
@@ -97,14 +88,11 @@ export LDSHARED="gcc -shared -Wl,--as-needed $RPM_LD_FLAGS"
# Build for python 3
mv src src2
mv src3 src
-# Setting CFLAGS is needed for python3.4.0 only, should be fixed in 3.4.1, see
-# http://bugs.python.org/issue21121
-CFLAGS=$(%{__python3} -c 'import sysconfig; print(sysconfig.getconfigvar("CFLAGS").replace("-Werror=declaration-after-statement",""))') \
%{__python3} setup.py build
# Rebuild the documentation
make -C doc clean
-make -C doc -B html
+make -C doc -B html SPHINXBUILD=%{_bindir}/sphinx-build-3
rm -f doc/build/html/.buildinfo
@@ -124,19 +112,24 @@ cp -a examples %{buildroot}%{_datadir}/%{name}/
%files
%doc LICENSE doc/build/html/
-%{python2_sitearch}/*egg-info
-%{python2_sitearch}/cvxopt
+%{python2_sitearch}/%{pkgname}*
%files examples
%{_datadir}/%{name}
-%files -n python3-cvxopt
+%files -n python3-%{pkgname}
%doc LICENSE doc/build/html/
-%{python3_sitearch}/*egg-info
-%{python3_sitearch}/cvxopt
+%{python3_sitearch}/%{pkgname}*
%changelog
+* Tue Jun 17 2014 Jerry James <loganjerry at gmail.com> - 1.1.7-1
+- New upstream release
+- Drop upstreamed -fixglpkinclude and -glpk patches
+- Use better URL for Source0
+- Build documentation with python3
+- Minor spec file cleanups
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.6-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index 8de251c..171feca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e940636b237715aeea5cffff3b0d9f55 1.1.6.tar.gz
+3073a5da23cb5a77d3bc143edde1e4f1 cvxopt-1.1.7.tar.gz
More information about the scm-commits
mailing list