[SCM] pyspatialite branch, master, updated. upstream/2.6.1-18-gabaf368

[David Paleino]

The following commit has been merged in the master branch:
commit d37bb95bdba32cb9554fb655fef5ff335fc1a728
Author: David Paleino <dapal at debian.org>
Date:   Sun Apr 15 10:54:44 2012 +0200

    Refresh patch

diff --git a/debian/patches/00-fix_build.patch b/debian/patches/00-fix_build.patch
index 41341ea..334bdc1 100644
--- a/debian/patches/00-fix_build.patch
+++ b/debian/patches/00-fix_build.patch
@@ -4,8 +4,8 @@ Origin: vendor
 Forwarded: no
 
 ---
- setup.py |   11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
+ setup.py |   21 ++++++++++++---------
+ 1 file changed, 12 insertions(+), 9 deletions(-)
 
 --- pyspatialite.orig/setup.py
 +++ pyspatialite/setup.py
@@ -18,15 +18,32 @@ Forwarded: no
  runtime_library_dirs = []
  extra_objects = []
  define_macros = []
-@@ -113,13 +113,14 @@ def get_amalgamation():
+@@ -113,24 +113,27 @@ def get_amalgamation():
  class MyBuildExt(build_ext):
  
      def build_extension(self, ext):
 -        get_amalgamation()
 +        #get_amalgamation()
+         # sometimes iconv is built in, sometimes it isn't
+         if not self.compiler.has_function("iconv"):
+           ext.libraries.append("iconv")
+ 
+         #Default locations for Mac
+-        ext.include_dirs.append("/Library/Frameworks/GEOS.framework/unix/include/")
+-        ext.include_dirs.append("/Library/Frameworks/PROJ.framework/unix/include/")
+-        ext.library_dirs.append("/Library/Frameworks/GEOS.framework/unix/lib")
+-        ext.library_dirs.append("/Library/Frameworks/PROJ.framework/unix/lib")
++        #ext.include_dirs.append("/Library/Frameworks/GEOS.framework/unix/include/")
++        #ext.include_dirs.append("/Library/Frameworks/PROJ.framework/unix/include/")
++        #ext.library_dirs.append("/Library/Frameworks/GEOS.framework/unix/lib")
++        #ext.library_dirs.append("/Library/Frameworks/PROJ.framework/unix/lib")
++        ext.include_dirs.append("/usr/include")
++        ext.library_dirs.append("/usr/lib")
+ 
          ext.define_macros.append(("SQLITE_ENABLE_FTS3", "1"))   # build with fulltext search enabled
          ext.define_macros.append(("SQLITE_ENABLE_RTREE", "1"))   # build with fulltext search enabled
          ext.define_macros.append(("SQLITE_ENABLE_COLUMN_METADATA", "1"))   # build with fulltext search enabled
+         ext.define_macros.append(("OMIT_FREEXL","1")) # build without FreeXL
 -        ext.sources.append(os.path.join(AMALGAMATION_ROOT, "sqlite3.c"))
 -        ext.sources.append(os.path.join(AMALGAMATION_ROOT, "spatialite.c"))
 -        ext.include_dirs.append(AMALGAMATION_ROOT)

-- 
Python interface to Spatialite