Compare commits
11 Commits
python-mat
...
f9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7c241d4d9e | ||
|
|
082548016a | ||
|
|
1c4497d18c | ||
|
|
b28430fd48 | ||
|
|
61aa382649 | ||
|
|
1f8c99bdef | ||
|
|
1437e01b55 | ||
|
|
4b93d98283 | ||
|
|
1ba7111ea4 | ||
|
|
d1a8b707e3 | ||
|
|
96119e78b7 |
@@ -1 +0,0 @@
|
||||
matplotlib-0.90.1.tar.gz
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
matplotlib-0.91.4.tar.gz
|
||||
21
Makefile
21
Makefile
@@ -1,21 +0,0 @@
|
||||
# Makefile for source rpm: python-matplotlib
|
||||
# $Id$
|
||||
NAME := python-matplotlib
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
||||
63
matplotlib-gcc43.patch
Normal file
63
matplotlib-gcc43.patch
Normal file
@@ -0,0 +1,63 @@
|
||||
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,7 +1,7 @@
|
||||
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||
|
||||
Name: python-matplotlib
|
||||
Version: 0.91.2
|
||||
Version: 0.91.4
|
||||
Release: 1%{?dist}
|
||||
Summary: Python plotting library
|
||||
|
||||
@@ -10,6 +10,7 @@ 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
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: python-devel, freetype-devel, libpng-devel, zlib-devel
|
||||
@@ -38,6 +39,7 @@ Requires: tkinter
|
||||
|
||||
%prep
|
||||
%setup -q -n matplotlib-%{version}
|
||||
#%patch0 -p1
|
||||
chmod -x lib/matplotlib/mpl-data/images/*.svg
|
||||
|
||||
%build
|
||||
@@ -74,6 +76,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Aug 6 2008 Jef Spaleta <jspaleta[AT]fedoraproject org> - 0.91.4-1
|
||||
- New upstream release with multiple fixes including crasher bugs
|
||||
|
||||
* 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
|
||||
|
||||
Reference in New Issue
Block a user