From f271c45196f140187d0201ca5f1bb1fcfa6f84df Mon Sep 17 00:00:00 2001
From: Volker Fröhlich <volker27@gmx.at>
Date: Dec 14 2012 23:07:14 +0000
Subject: New upstream release 1.8


---

diff --git a/.gitignore b/.gitignore
index f6fdfc9..ab536da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /spatialindex-src-1.6.1.tar.bz2
 /spatialindex-src-1.7.1.tar.bz2
+/spatialindex-src-1.8.0.tar.bz2
diff --git a/sources b/sources
index 0770b17..2839fcf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-15e5fcff393a56ab9aa7553e4a9cd64a  spatialindex-src-1.7.1.tar.bz2
+3f3e79109de8546de88fafc08b79f97f  spatialindex-src-1.8.0.tar.bz2
diff --git a/spatialindex-1.8.0-soname.patch b/spatialindex-1.8.0-soname.patch
new file mode 100644
index 0000000..6c9bd64
--- /dev/null
+++ b/spatialindex-1.8.0-soname.patch
@@ -0,0 +1,19 @@
+diff -Nur spatialindex-src-1.8.0/src/CMakeLists.txt spatialindex-src-1.8.0-soname/src/CMakeLists.txt
+--- spatialindex-src-1.8.0/src/CMakeLists.txt	2012-10-24 22:08:28.000000000 +0200
++++ spatialindex-src-1.8.0-soname/src/CMakeLists.txt	2012-12-13 20:47:07.668114280 +0100
+@@ -203,12 +203,13 @@
+ )
+ 
+ 
++#TODO: Major-Version wo definieren
+ 
+ set_target_properties(${SIDX_LIB_NAME}
+-  PROPERTIES SOVERSION "${SIDX_LIB_SOVERSION}" )
++    PROPERTIES VERSION "${SIDX_LIB_SOVERSION}" SOVERSION 3)
+ 
+ set_target_properties(${SIDX_C_LIB_NAME} 
+-  PROPERTIES SOVERSION "${SIDX_LIB_SOVERSION}" )
++    PROPERTIES VERSION "${SIDX_LIB_SOVERSION}" SOVERSION 3)
+ 
+ 
+ 
diff --git a/spatialindex.spec b/spatialindex.spec
index ef4e796..959eef9 100644
--- a/spatialindex.spec
+++ b/spatialindex.spec
@@ -1,16 +1,16 @@
 Name:      spatialindex
-Version:   1.7.1
-Release:   3%{?dist}
+Version:   1.8.0
+Release:   1%{?dist}
 Summary:   Spatial index library 
 Group:     System Environment/Libraries
-License:   LGPLv2+
-URL:       http://libspatialindex.github.com
+License:   MIT
+URL:       http://libspatialindex.org
 Source0:   http://download.osgeo.org/lib%{name}/%{name}-src-%{version}.tar.bz2
 
 # Create proper soname symlinks and versioned libspatialindex_c
 # https://github.com/libspatialindex/libspatialindex/issues/9
-# https://github.com/libspatialindex/libspatialindex/issues/6
-Patch0:    %{name}-1.7.1-soname-includedir.patch
+# Autotools do it automatically
+Patch0:    %{name}-1.8.0-soname.patch
 
 BuildRequires:    cmake
 
@@ -32,16 +32,7 @@ Development files for %{name}.
 
 %prep
 %setup -qn %{name}-src-%{version}
-%patch0 -p1 -b .soname-includedir~
-
-# 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
+%patch0 -p1 -b .soname~
 
 
 %build
@@ -52,10 +43,6 @@ make %{?_smp_mflags}
 %install
 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
@@ -76,6 +63,11 @@ make install DESTDIR=%{buildroot}
 
 
 %changelog
+* Thu Dec 13 2012 Volker Fröhlich <volker27@gmx.at> - 1.8.0-1
+- New upstream release
+- New URL
+- License is now MIT
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild