[spatialindex] UPDATE TO 1.7.1

[Volker Fröhlich]

commit e67ef4d31c1feb3d79dfd3e42955f5a0364bb9c4
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Mon Apr 9 02:26:03 2012 +0200

    UPDATE TO 1.7.1

 .gitignore        |    1 +
 sources           |    2 +-
 spatialindex.spec |   59 ++++++++++++++++++++++++++++++++++------------------
 3 files changed, 40 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 79e50ea..f6fdfc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /spatialindex-src-1.6.1.tar.bz2
+/spatialindex-src-1.7.1.tar.bz2
diff --git a/sources b/sources
index 86fddb2..0770b17 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-63399913b42278cfcfd2c79d1b2ec4a3  spatialindex-src-1.6.1.tar.bz2
+15e5fcff393a56ab9aa7553e4a9cd64a  spatialindex-src-1.7.1.tar.bz2
diff --git a/spatialindex.spec b/spatialindex.spec
index e070e2f..52ba2b5 100644
--- a/spatialindex.spec
+++ b/spatialindex.spec
@@ -1,12 +1,15 @@
 Name:      spatialindex
-Version:   1.6.1
-Release:   5%{?dist}
+Version:   1.7.1
+Release:   1%{?dist}
 Summary:   Spatial index library 
 Group:     System Environment/Libraries
 License:   LGPLv2+
-URL:       http://trac.gispython.org/spatialindex
+URL:       http://libspatialindex.github.com
 Source0:   http://download.osgeo.org/lib%{name}/%{name}-src-%{version}.tar.bz2
 
+BuildRequires:    cmake
+
+
 %description
 Spatialindex provides a general framework for developing spatial indices.
 Currently it defines generic interfaces, provides simple main memory and
@@ -21,39 +24,42 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %description devel
 Development files for %{name}.
 
-# Correct FSF postal address
-# Request sent to spatialindex at lists.gispython.org
-sed -i 's/59 Temple Place, Suite 330/51 Franklin Street, Fifth Floor/' COPYING
-sed -i 's/02111-1307/02110-1301/' COPYING
-
-#TODO: Undefined symbols
-# ldd -d -r /usr/lib64/libspatialindex.so.1.0.0
 
 %prep
 %setup -qn %{name}-src-%{version}
-chmod -x include/tools/*.h
 
-%build
-%configure
+# Correct FSF postal address
+# https://github.com/libspatialindex/libspatialindex/issues/5
+for f in $(find . \( -name "*.h" -o -name "*.cc" -o -name COPYING \)); do
+    sed -e 's/59 Temple Place, Suite 330/51 Franklin Street, Fifth Floor/' \
+    -e 's/02111-1307/02110-1301/' $f > $f.tmp \
+    && touch -r $f $f.tmp \
+    && mv $f.tmp $f
+done
 
-# Remove rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
+%build
+%cmake .
 make %{?_smp_mflags}
 
+
 %install
-make install INSTALL='install -p' DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
+
+# https://github.com/libspatialindex/libspatialindex/issues/6
+# Upstream changed the include dir but forgot to update the include directive
+#sed -i 's|#include <spatialindex/tools/Tools.h>|#include <libspatialindex/tools/Tools.h>|' include/spatialindex/Point.h
+mv %{buildroot}%{_includedir}/lib%{name} %{buildroot}%{_includedir}/%{name} 
+
+# Tests must be run manually and seemingly are not built yet
+# See changelog 2011-10-11
 
-# Delete libtool archives, because we don't ship them.
-pushd %{buildroot}%{_libdir} 
-  rm -f *.a *.la
-popd
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+
 %files 
 %doc AUTHORS ChangeLog COPYING README
 %{_libdir}/lib%{name}*.so.*
@@ -62,7 +68,18 @@ popd
 %{_includedir}/%{name}
 %{_libdir}/lib%{name}*.so
 
+
 %changelog
+* Mon Apr  8 2012 Volker Fröhlich <volker27 at gmx.at> - 1.7.1-1
+- Update for new release
+- Drop 64 bit patch
+- Header permissions are correct now
+- Move header files to spatialindex sub-directory
+- Correct FSF address in all files
+- Update URL
+- Upstream switched to Cmake
+- No more issues with rpath, libtool archives or undefined symbols
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.1-5
 - Rebuilt for c++ ABI breakage