From 19ef8e81dbee12fa4dc202bfdda0dd4f3c5ca1bd Mon Sep 17 00:00:00 2001 From: Jussi Lehtola Date: Mon, 6 Sep 2010 21:05:41 +0300 Subject: [PATCH] Patch around BZ #564504. --- sources | 2 +- sympy.spec | 71 ++++++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 59 insertions(+), 14 deletions(-) diff --git a/sources b/sources index 3cbb6c3..e5ea486 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7407285e8a68d1a6d2e35a0608e51104 sympy-0.6.3.tar.gz +d73e0a5a128f38f930d566110f4b668b sympy-0.6.7.tar.gz diff --git a/sympy.spec b/sympy.spec index 233ecfb..925fe47 100644 --- a/sympy.spec +++ b/sympy.spec @@ -1,18 +1,30 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: sympy -Version: 0.6.3 -Release: 3%{?dist} +Version: 0.6.7 +Release: 5%{?dist} Summary: A Python library for symbolic mathematics Group: Development/Languages License: BSD URL: http://code.google.com/p/sympy/ Source0: http://sympy.googlecode.com/files/%{name}-%{version}.tar.gz +# Upstream tried to graft in another project as a private copy; we rip +# it out (rhbz# 551576): +Patch0: sympy-0.6.7-strip-internal-mpmath.diff + +# Fix a python 2.7 incompatibility +# Not yet sent upstream: +Patch1: sympy-python27.patch + +# Add mpf symbols +Patch2: sympy-0.6.7-mpf.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel - +BuildRequires: python-mpmath +Requires: python-mpmath %description SymPy aims to become a full-featured computer algebra system (CAS) @@ -20,33 +32,66 @@ while keeping the code as simple as possible in order to be comprehensible and easily extensible. SymPy is written entirely in Python and does not require any external libraries. - %prep %setup -q +%patch0 -p1 -b .mpmath +rm -rf sympy/mpmath doc/src/modules/mpmath +%patch1 -p1 +%patch2 -p1 %build -%{__python} setup.py build - +python setup.py build %install -rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +rm -rf %{buildroot} +python setup.py install -O1 --skip-build --root %{buildroot} +# Remove extra files +rm -f %{buildroot}%{_bindir}/{,doc}test +%check +python setup.py test %clean -rm -rf $RPM_BUILD_ROOT - +rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README LICENSE -%{python_sitelib}/* +%{python_sitelib}/sympy/ +%{python_sitelib}/sympy-%{version}-*.egg-info %{_bindir}/isympy %{_mandir}/man1/isympy.1* - %changelog +* Mon Aug 30 2010 Jussi Lehtola - 0.6.7-5 +- Patch around BZ #564504. + +* Sat Jul 31 2010 David Malcolm - 0.6.7-4 +- fix a python 2.7 incompatibility + +* Thu Jul 22 2010 David Malcolm - 0.6.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Tue Apr 27 2010 Jussi Lehtola - 0.6.7-2 +- Added %%check phase. + +* Tue Apr 27 2010 Jussi Lehtola - 0.6.7-1 +- Update to 0.6.7. + +* Mon Feb 15 2010 Conrad Meyer - 0.6.6-3 +- Patch around private copy nicely; avoid breakage from trying to replace + a directory with a symlink. + +* Mon Feb 15 2010 Conrad Meyer - 0.6.6-2 +- Remove private copy of system lib 'mpmath' (rhbz #551576). + +* Sun Dec 27 2009 Jussi Lehtola - 0.6.6-1 +- Update to 0.6.6. + +* Sat Nov 07 2009 Jussi Lehtola - 0.6.5-1 +- Update to 0.6.5. + * Sun Jul 26 2009 Fedora Release Engineering - 0.6.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild