- rebuild against mysql 5.1.30

This commit is contained in:
Balint Cristian 2009-02-02 21:11:25 +00:00
parent 41d81be584
commit d738089a93
3 changed files with 27 additions and 1 deletions

20
gdal-mysql.patch Normal file
View File

@ -0,0 +1,20 @@
--- 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 */
/************************************************************************/

View File

@ -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 @@ URL: http://www.gdal.org/
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 @@ The GDAL java modules provides support to handle multiple GIS file formats.
%if "%{?dist}" == ".fc10"
%patch0 -p1 -b .libdap~
%endif
%patch1 -p0 -b .mysql~
# unpack test cases olso.
tar -xzf %{SOURCE1}
@ -528,6 +530,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Thu Jan 29 2009 Balint Cristian <crisitan.balint@gmail.com> - 1.6.0-3
- rebuild against mysql 5.1.30
* Thu Jan 29 2009 Balint Cristian <crisitan.balint@gmail.com> - 1.6.0-2
- email change
- rebuild without grass

View File

@ -5,3 +5,4 @@ gdal-1_6_0-0_1_rc4_fc11:HEAD:gdal-1.6.0-0.1.rc4.fc11.src.rpm:1228594658
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