rpms/gdal/devel gdal-mysql.patch, NONE, 1.1 gdal.spec, 1.57, 1.58 import.log, 1.9, 1.10

[Balint Cristian]

Author: rezso

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

Modified Files:
	gdal.spec import.log 
Added Files:
	gdal-mysql.patch 
Log Message:
- rebuild against mysql 5.1.30


gdal-mysql.patch:

--- NEW FILE gdal-mysql.patch ---
--- ogr/ogrsf_frmts/mysql/ogr_mysql.h.orig	2008-10-23 03:04:33.000000000 +0300
+++ ogr/ogrsf_frmts/mysql/ogr_mysql.h	2009-02-02 22:47:05.000000000 +0200
@@ -31,6 +31,8 @@
 #ifndef _OGR_MYSQL_H_INCLUDED
 #define _OGR_MYSQL_H_INCLUDED
 
+#include "ogrsf_frmts.h"
+
 #include <my_global.h>
 #include <mysql.h>
 
@@ -38,8 +40,6 @@
 #undef bool
 #endif
 
-#include "ogrsf_frmts.h"
-
 /************************************************************************/
 /*                            OGRMySQLLayer                             */
 /************************************************************************/


Index: gdal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/gdal.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- gdal.spec	29 Jan 2009 14:21:56 -0000	1.57
+++ gdal.spec	2 Feb 2009 21:11:25 -0000	1.58
@@ -1,6 +1,6 @@
 Name:      gdal
 Version:   1.6.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   GIS file format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -8,6 +8,7 @@
 Source0:   %{name}-%{version}-fedora.tar.gz
 Source1:   http://download.osgeo.org/gdal/gdalautotest-1.6.0.tar.gz
 Patch0:    %{name}-libdap.patch
+Patch1:    %{name}-mysql.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool pkgconfig
 BuildRequires: python-devel numpy xerces-c-devel
@@ -103,6 +104,7 @@
 %if "%{?dist}" == ".fc10"
 %patch0 -p1 -b .libdap~
 %endif
+%patch1 -p0 -b .mysql~
 
 # unpack test cases olso.
 tar -xzf %{SOURCE1}
@@ -528,6 +530,9 @@
 %endif
 
 %changelog
+* Thu Jan 29 2009 Balint Cristian <crisitan.balint at gmail.com> - 1.6.0-3
+- rebuild against mysql 5.1.30
+
 * Thu Jan 29 2009 Balint Cristian <crisitan.balint at gmail.com> - 1.6.0-2
 - email change
 - rebuild without grass


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	29 Jan 2009 14:21:56 -0000	1.9
+++ import.log	2 Feb 2009 21:11:25 -0000	1.10
@@ -5,3 +5,4 @@
 gdal-1_6_0-0_2_rc4_fc11:HEAD:gdal-1.6.0-0.2.rc4.fc11.src.rpm:1228602531
 gdal-1_6_0-1_fc11:HEAD:gdal-1.6.0-1.fc11.src.rpm:1229050992
 gdal-1_6_0-2_fc11:HEAD:gdal-1.6.0-2.fc11.src.rpm:1233238875
+gdal-1_6_0-3_fc11:HEAD:gdal-1.6.0-3.fc11.src.rpm:1233609041