rpms/python-matplotlib/devel matplotlib-gcc43.patch, NONE, 1.1 python-matplotlib.spec, 1.35, 1.36

Jef Spaleta (jspaleta) fedora-extras-commits at redhat.com
Mon Mar 24 19:32:10 UTC 2008


Author: jspaleta

Update of /cvs/pkgs/rpms/python-matplotlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13097

Modified Files:
	python-matplotlib.spec 
Added Files:
	matplotlib-gcc43.patch 
Log Message:
* Fri Mar  21 2008 Jef Spaleta <jspaleta[AT]fedoraproject org> - 0.91.2-2
- gcc43 cleanups


matplotlib-gcc43.patch:

--- NEW FILE matplotlib-gcc43.patch ---
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


Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-matplotlib/devel/python-matplotlib.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- python-matplotlib.spec	21 Mar 2008 20:19:00 -0000	1.35
+++ python-matplotlib.spec	24 Mar 2008 19:31:26 -0000	1.36
@@ -2,7 +2,7 @@
 
 Name:           python-matplotlib
 Version:        0.91.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python plotting library
 
 Group:          Development/Libraries
@@ -10,6 +10,7 @@
 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 @@
 
 %prep
 %setup -q -n matplotlib-%{version}
+%patch0 -p1
 chmod -x lib/matplotlib/mpl-data/images/*.svg
 
 %build
@@ -74,6 +76,9 @@
 
 
 %changelog
+* 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




More information about the fedora-extras-commits mailing list