[routino] * Tue May 31 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0-2 - README-MARBLE.txt: mention that da

[Kevin Kofler]

commit b2b0e9c7c5a7493192290fe1a3d897e596032a10
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Tue May 31 17:59:30 2011 +0200

    * Tue May 31 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0-2
    - README-MARBLE.txt: mention that data files from old version no longer work
    - Fix segmentation fault in planetsplitter (at least on austria.osm)

 README-MARBLE.txt                         |    4 ++++
 routino-2.0-planetsplitter-segfault.patch |   13 +++++++++++++
 routino.spec                              |   11 +++++++++--
 3 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/README-MARBLE.txt b/README-MARBLE.txt
index c907262..e6ef4c2 100644
--- a/README-MARBLE.txt
+++ b/README-MARBLE.txt
@@ -1,6 +1,10 @@
 SETTING UP ROUTINO FOR USE WITH MARBLE
 ======================================
 
+IMPORTANT: If you are upgrading from a previous release of Routino, you MUST
+           run these steps (at least step 4) again. Existing .mem files from
+           previous releases of Routino cannot be used with version 2.0.
+
 Since Marble 1.0.0 (kdeedu 4.6.0), Marble supports computing routes using
 Routino. The following instructions describe how to set that up:
 
diff --git a/routino-2.0-planetsplitter-segfault.patch b/routino-2.0-planetsplitter-segfault.patch
new file mode 100644
index 0000000..70c112b
--- /dev/null
+++ b/routino-2.0-planetsplitter-segfault.patch
@@ -0,0 +1,13 @@
+diff -ur routino-2.0/src/segmentsx.c routino-2.0-planetsplitter-segfault/src/segmentsx.c
+--- routino-2.0/src/segmentsx.c	2011-05-30 14:59:13.000000000 +0200
++++ routino-2.0-planetsplitter-segfault/src/segmentsx.c	2011-05-31 17:56:17.000000000 +0200
+@@ -267,6 +267,9 @@
+  index_t index=segmentsx->firstnode[nodeindex];
+  SegmentX *segmentx;
+ 
++ if(index>=segmentsx->number)
++    return(NULL);
++
+  segmentx=LookupSegmentX(segmentsx,index,position);
+ 
+  if(segmentx->node1!=nodeindex && segmentx->node2!=nodeindex)
diff --git a/routino.spec b/routino.spec
index 928b3a4..d3d32c1 100644
--- a/routino.spec
+++ b/routino.spec
@@ -1,7 +1,7 @@
 Name: routino
 Summary: Router for OpenStreetMap Data
 Version: 2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: AGPLv3+
 Group: Applications/Productivity
 URL: http://www.routino.org/
@@ -12,6 +12,8 @@ Source1: README-MARBLE.txt
 Patch0: routino-2.0-makefiles.patch
 # remove references to INSTALL.txt/installation.html which we don't ship
 Patch1: routino-1.5.1-no-install-doc.patch
+# fix segmentation fault in planetsplitter (at least on austria.osm)
+Patch2: routino-2.0-planetsplitter-segfault.patch
 BuildRequires: flex
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -27,6 +29,7 @@ cp -p %{SOURCE1} doc/
 # Get rid of installation documentation which is not applicable to the RPM
 %patch1 -p1 -b .no-install-doc
 rm -f INSTALL.txt doc/INSTALL.txt doc/html/installation.html
+%patch2 -p1 -b .planetsplitter-segfault
 # The web stuff needs more work to be packaged. The makefiles will copy things
 # into the web directory if it's present, so get rid of it now.
 rm -rf web
@@ -49,8 +52,12 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/
 
 %changelog
+* Tue May 31 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0-2
+- README-MARBLE.txt: mention that data files from old version no longer work
+- Fix segmentation fault in planetsplitter (at least on austria.osm)
+
 * Tue May 31 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0-1
-- Update to 2.0
+- Update to 2.0 (#709309, adds turn restriction support among other things)
 
 * Tue Apr 26 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.5.1-5
 - README-MARBLE.txt: clarify minimum Marble version (1.0.0 / kdeedu 4.6.0)