Compare commits
13 Commits
python-mat
...
python-mat
| Author | SHA1 | Date | |
|---|---|---|---|
|
1ba7111ea4 | ||
|
|
d1a8b707e3 | ||
|
|
96119e78b7 | ||
|
|
d53984287e | ||
|
|
bb617decf4 | ||
|
|
32df714ed8 | ||
|
|
0346b9d0bb | ||
|
|
5550f6f7b0 | ||
|
|
a019183ab9 | ||
|
|
f319b1c04c | ||
|
|
5ca800e2a0 | ||
|
|
1887561de2 | ||
|
|
4172d14025 |
@@ -1,63 +0,0 @@
|
||||
diff -u -r matplotlib-0.91.2-old/ttconv/pprdrv.h matplotlib-0.91.2/ttconv/pprdrv.h
|
||||
--- matplotlib-0.91.2-old/ttconv/pprdrv.h 2007-11-29 17:36:53.000000000 -0900
|
||||
+++ matplotlib-0.91.2/ttconv/pprdrv.h 2008-03-21 13:58:01.000000000 -0800
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
|
||||
#include <vector>
|
||||
-#include <assert.h>
|
||||
+#include <cassert>
|
||||
|
||||
/*
|
||||
* Encapsulates all of the output to write to an arbitrary output
|
||||
diff -u -r matplotlib-0.91.2-old/ttconv/pprdrv_tt2.cpp matplotlib-0.91.2/ttconv/pprdrv_tt2.cpp
|
||||
--- matplotlib-0.91.2-old/ttconv/pprdrv_tt2.cpp 2007-11-29 17:36:53.000000000 -0900
|
||||
+++ matplotlib-0.91.2/ttconv/pprdrv_tt2.cpp 2008-03-21 16:04:49.000000000 -0800
|
||||
@@ -31,10 +31,11 @@
|
||||
*/
|
||||
|
||||
#include "global_defines.h"
|
||||
-#include <math.h>
|
||||
-#include <stdlib.h>
|
||||
-#include <string.h>
|
||||
-#include <memory.h>
|
||||
+#include <cmath>
|
||||
+#include <cstdlib>
|
||||
+#include <cstdio>
|
||||
+#include <cstring>
|
||||
+#include <memory>
|
||||
#include "pprdrv.h"
|
||||
#include "truetype.h"
|
||||
#include <algorithm>
|
||||
diff -u -r matplotlib-0.91.2-old/ttconv/pprdrv_tt.cpp matplotlib-0.91.2/ttconv/pprdrv_tt.cpp
|
||||
--- matplotlib-0.91.2-old/ttconv/pprdrv_tt.cpp 2007-11-29 17:36:53.000000000 -0900
|
||||
+++ matplotlib-0.91.2/ttconv/pprdrv_tt.cpp 2008-03-21 15:57:42.000000000 -0800
|
||||
@@ -23,9 +23,9 @@
|
||||
*/
|
||||
|
||||
#include "global_defines.h"
|
||||
-#include <stdio.h>
|
||||
-#include <stdlib.h>
|
||||
-#include <string.h>
|
||||
+#include <cstdio>
|
||||
+#include <cstdlib>
|
||||
+#include <cstring>
|
||||
#include "pprdrv.h"
|
||||
#include "truetype.h"
|
||||
#include <sstream>
|
||||
diff -u -r matplotlib-0.91.2-old/ttconv/ttutil.cpp matplotlib-0.91.2/ttconv/ttutil.cpp
|
||||
--- matplotlib-0.91.2-old/ttconv/ttutil.cpp 2007-11-29 17:36:53.000000000 -0900
|
||||
+++ matplotlib-0.91.2/ttconv/ttutil.cpp 2008-03-24 11:25:06.000000000 -0800
|
||||
@@ -8,9 +8,9 @@
|
||||
/* (c) Frank Siegert 1996 */
|
||||
|
||||
#include "global_defines.h"
|
||||
-#include <stdio.h>
|
||||
-#include <stdarg.h>
|
||||
-#include <stdlib.h>
|
||||
+#include <cstdio>
|
||||
+#include <cstdarg>
|
||||
+#include <cstdlib>
|
||||
#include "pprdrv.h"
|
||||
|
||||
#if DEBUG_TRUETYPE
|
||||
@@ -1,24 +1,24 @@
|
||||
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||
|
||||
Name: python-matplotlib
|
||||
Version: 0.98.5.2
|
||||
Release: 3%{?dist}
|
||||
Version: 0.90.1
|
||||
Release: 5%{?dist}
|
||||
Summary: Python plotting library
|
||||
|
||||
Group: Development/Libraries
|
||||
License: Python
|
||||
URL: http://sourceforge.net/projects/matplotlib
|
||||
Source0: http://downloads.sourceforge.net/matplotlib/matplotlib-%{version}.tar.gz
|
||||
Source1: setup.cfg
|
||||
Patch0: matplotlib-gcc43.patch
|
||||
Patch0: matplotlib-0.87.7-matplotlibrc.patch
|
||||
Patch1: matplotlib-0.90.1-setup.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: python-devel, freetype-devel, libpng-devel, zlib-devel
|
||||
BuildRequires: pygtk2-devel, gtk2-devel, tkinter, tk-devel
|
||||
BuildRequires: pytz, python-dateutil, numpy
|
||||
BuildRequires: python-numeric, pytz, python-dateutil, numpy, python-numarray
|
||||
Requires: numpy, pytz, python-dateutil
|
||||
Requires: pycairo >= 1.2.0
|
||||
#Requires: dejavu-fonts
|
||||
|
||||
|
||||
%description
|
||||
Matplotlib is a pure python plotting library with the goal of making
|
||||
@@ -39,11 +39,11 @@ Requires: tkinter
|
||||
|
||||
%prep
|
||||
%setup -q -n matplotlib-%{version}
|
||||
#%patch0 -p1
|
||||
%patch0 -p1 -b .matplotlibrc
|
||||
%patch1 -p1 -b .setup
|
||||
chmod -x lib/matplotlib/mpl-data/images/*.svg
|
||||
|
||||
%build
|
||||
cp %{SOURCE1} ./setup.cfg
|
||||
%{__python} setup.py build
|
||||
|
||||
%install
|
||||
@@ -56,15 +56,14 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc README.txt license/LICENSE license/LICENSE_enthought.txt
|
||||
%doc README license/LICENSE license/LICENSE_enthought.txt
|
||||
%doc license/LICENSE_PAINT license/LICENSE_PIL
|
||||
%doc CHANGELOG CXX INSTALL INTERACTIVE KNOWN_BUGS
|
||||
%doc PKG-INFO TODO examples
|
||||
%doc API_CHANGES CHANGELOG CXX INSTALL INTERACTIVE KNOWN_BUGS
|
||||
%doc NUMARRAY_ISSUES PKG-INFO TODO examples
|
||||
%if 0%{?fedora} >= 9
|
||||
%{python_sitearch}/*egg-info
|
||||
%endif
|
||||
%{python_sitearch}/matplotlib/
|
||||
%{python_sitearch}/mpl_toolkits/
|
||||
%{python_sitearch}/pylab.py*
|
||||
%exclude %{python_sitearch}/matplotlib/backends/backend_tkagg.*
|
||||
%exclude %{python_sitearch}/matplotlib/backends/tkagg.*
|
||||
@@ -77,31 +76,6 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue May 26 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.5-3
|
||||
- Latest upstream release
|
||||
- Updated to work with numpy update see EPEL bug 502082
|
||||
- Be aware that some internal matplotlib APIs have changed
|
||||
|
||||
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.98.3-2
|
||||
- Rebuild for Python 2.6
|
||||
|
||||
* Wed Aug 6 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.3-1
|
||||
- Latest upstream release
|
||||
|
||||
* Fri Jul 1 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.1-1
|
||||
- Latest upstream release
|
||||
|
||||
* Fri Mar 21 2008 Jef Spaleta <jspaleta[AT]fedoraproject org> - 0.91.2-2
|
||||
- gcc43 cleanups
|
||||
|
||||
* Fri Mar 21 2008 Jef Spaleta <jspaleta[AT]fedoraproject org> - 0.91.2-1
|
||||
- New upstream version
|
||||
- Adding Fedora specific setup.cfg from included template
|
||||
- removed numarry and numerics build requirements
|
||||
|
||||
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.90.1-6
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
* Fri Jan 4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.90.1-5
|
||||
- Fixed typo in spec.
|
||||
|
||||
|
||||
81
setup.cfg
81
setup.cfg
@@ -1,81 +0,0 @@
|
||||
# Rename this file to setup.cfg to modify matplotlib's
|
||||
# build options.
|
||||
|
||||
[egg_info]
|
||||
tag_svn_revision = 1
|
||||
|
||||
[status]
|
||||
# To suppress display of the dependencies and their versions
|
||||
# at the top of the build log, uncomment the following line:
|
||||
#suppress = True
|
||||
#
|
||||
# Uncomment to insert lots of diagnostic prints in extension code
|
||||
#verbose = True
|
||||
|
||||
[provide_packages]
|
||||
# By default, matplotlib checks for a few dependencies and
|
||||
# installs them if missing. This feature can be turned off
|
||||
# by uncommenting the following lines. Acceptible values are:
|
||||
# True: install, overwrite an existing installation
|
||||
# False: do not install
|
||||
# auto: install only if the package is unavailable. This
|
||||
# is the default behavior
|
||||
#
|
||||
## Date/timezone support:
|
||||
#pytz = False
|
||||
#dateutil = False
|
||||
#
|
||||
## Experimental config package support:
|
||||
enthought.traits = False
|
||||
configobj = False
|
||||
|
||||
[gui_support]
|
||||
# Matplotlib supports multiple GUI toolkits, including Cocoa,
|
||||
# GTK, Fltk, Qt, Qt4, Tk, and WX. Support for many of these
|
||||
# toolkits requires AGG, the Anti-Grain Geometry library, which
|
||||
# is provided by matplotlib and built by default.
|
||||
#
|
||||
# Some backends are written in pure Python, and others require
|
||||
# extension code to be compiled. By default, matplotlib checks
|
||||
# for these GUI toolkits during installation and, if present,
|
||||
# compiles the required extensions to support the toolkit. GTK
|
||||
# support requires the GTK runtime environment and PyGTK. Wx
|
||||
# support requires wxWidgets and wxPython. Tk support requires
|
||||
# Tk and Tkinter. The other GUI toolkits do not require any
|
||||
# extension code, and can be used as long as the libraries are
|
||||
# installed on your system.
|
||||
#
|
||||
# You can uncomment any the following lines if you know you do
|
||||
# not want to use the GUI toolkit. Acceptible values are:
|
||||
# True: build the extension. Exits with a warning if the
|
||||
# required dependencies are not available
|
||||
# False: do not build the extension
|
||||
# auto: build if the required dependencies are available,
|
||||
# otherwise skip silently. This is the default
|
||||
# behavior
|
||||
#
|
||||
gtk = True
|
||||
gtkagg = True
|
||||
tkagg = True
|
||||
wxagg = False
|
||||
|
||||
[rc_options]
|
||||
# User-configurable options
|
||||
#
|
||||
# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg,
|
||||
# GTKCairo, FltkAgg, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
|
||||
#
|
||||
# The Agg, Ps, Pdf and SVG backends do not require external
|
||||
# dependencies. Do not choose GTK, GTKAgg, GTKCairo, TkAgg or WXAgg if
|
||||
# you have disabled the relevent extension modules. Agg will be used
|
||||
# by default.
|
||||
#
|
||||
backend = GTKAgg
|
||||
#
|
||||
# The numerix module was historically used to provide
|
||||
# compatibility between the Numeric, numarray, and NumPy array
|
||||
# packages. Now that NumPy has emerge as the universal array
|
||||
# package for python, numerix is not really necessary and is
|
||||
# maintained to provide backward compatibility. Do not change
|
||||
# this unless you have a compelling reason to do so.
|
||||
numerix = numpy
|
||||
Reference in New Issue
Block a user