rpms/grass/devel grass-gcc44.patch,NONE,1.1 grass.spec,1.25,1.26

[Jesse Keating]

Author: jkeating

Update of /cvs/pkgs/rpms/grass/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26847

Modified Files:
	grass.spec 
Added Files:
	grass-gcc44.patch 
Log Message:
* Mon Mar 23 2009 Lubomir Rintel <lkundrak at v3.sk> - 6.3.0-12
- Fix build with GCC 4.4


grass-gcc44.patch:

--- NEW FILE grass-gcc44.patch ---
Fix build with GCC 4.4

Lubomir Rintel <lkundrak at v3.sk>

diff -up grass-6.3.0/imagery/i.atcorr/Output.h.gcc44 grass-6.3.0/imagery/i.atcorr/Output.h
--- grass-6.3.0/imagery/i.atcorr/Output.h.gcc44	2009-03-23 21:22:56.664618731 +0100
+++ grass-6.3.0/imagery/i.atcorr/Output.h	2009-03-23 21:23:10.349620131 +0100
@@ -4,6 +4,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
+#include <cstdio>
 
 class Output
 {


Index: grass.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grass/devel/grass.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- grass.spec	25 Feb 2009 00:56:59 -0000	1.25
+++ grass.spec	23 Mar 2009 21:28:15 -0000	1.26
@@ -1,6 +1,6 @@
 Name:      grass
 Version:   6.3.0
-Release:   11%{?dist}
+Release:   12%{?dist}
 Summary:   GRASS - Geographic Resources Analysis Support System
 Group:     Applications/Engineering
 License:   GPLv2
@@ -11,6 +11,7 @@
 Patch0:    grass-pkgconf.patch
 Patch1:    grass-shlib-soname.patch
 Patch2:    grass-gdilib.patch
+Patch3:    grass-gcc44.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  proj-nad proj-epsg wxPython
 
@@ -64,6 +65,7 @@
 %patch0 -p0 -b .pkgconf~
 %patch1 -p0 -b .shlibver~
 %patch2 -p0 -b .gdilib~
+%patch3 -p1 -b .gcc44~
 
 # readline requires ncurses, so workaround
 # correct mysql_config query
@@ -329,6 +331,9 @@
 %{_libdir}/libgrass_*.so
 
 %changelog
+* Mon Mar 23 2009 Lubomir Rintel <lkundrak at v3.sk> - 6.3.0-12
+- Fix build with GCC 4.4
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.3.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild