[routino/f15] * Sun Oct 30 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.3-2 - Add upstream patch to increase h

[Kevin Kofler]

commit 1683795c1f174d95178bcb35528e91d3ff092f7b
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sun Oct 30 15:59:17 2011 +0100

    * Sun Oct 30 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.3-2
    - Add upstream patch to increase hash table sizes (factor 5 speedup in routing)

 routino-2.0.3-rev855.patch |   69 ++++++++++++++++++++++++++++++++++++++++++++
 routino.spec               |    8 ++++-
 2 files changed, 76 insertions(+), 1 deletions(-)
---
diff --git a/routino-2.0.3-rev855.patch b/routino-2.0.3-rev855.patch
new file mode 100644
index 0000000..b88c002
--- /dev/null
+++ b/routino-2.0.3-rev855.patch
@@ -0,0 +1,69 @@
+diff -ur routino-2.0.3/src/optimiser.c routino-2.0.3-rev855/src/optimiser.c
+--- routino-2.0.3/src/optimiser.c	2011-08-04 12:49:56.000000000 +0200
++++ routino-2.0.3-rev855/src/optimiser.c	2011-10-30 15:55:05.000000000 +0100
+@@ -92,7 +92,7 @@
+ 
+  /* Create the list of results and insert the first node into the queue */
+ 
+- results=NewResultsList(8);
++ results=NewResultsList(64);
+ 
+  results->start_node=start_node;
+  results->prev_segment=prev_segment;
+@@ -347,7 +347,7 @@
+ 
+  /* Create the list of results and insert the first node into the queue */
+ 
+- results=NewResultsList(2048);
++ results=NewResultsList(131072);
+ 
+  results->start_node=begin->start_node;
+  results->prev_segment=begin->prev_segment;
+@@ -715,7 +715,7 @@
+ 
+  /* Create the results and insert the start node */
+ 
+- results=NewResultsList(8);
++ results=NewResultsList(64);
+ 
+  results->start_node=start_node;
+  results->prev_segment=prev_segment;
+@@ -931,7 +931,7 @@
+ 
+  /* Create the results and insert the finish node */
+ 
+- results=NewResultsList(8);
++ results=NewResultsList(64);
+ 
+  results->finish_node=finish_node;
+ 
+@@ -1105,7 +1105,7 @@
+ 
+  /* Create a results structure with the node at the end of the segment opposite the start */
+ 
+- results2=NewResultsList(8);
++ results2=NewResultsList(64);
+ 
+  results2->finish_node=results->finish_node;
+ 
+@@ -1171,7 +1171,7 @@
+  Result *midres,*comres1;
+  Results *combined;
+ 
+- combined=NewResultsList(64);
++ combined=NewResultsList(256);
+ 
+  combined->start_node=begin->start_node;
+  combined->prev_segment=begin->prev_segment;
+diff -ur routino-2.0.3/src/superx.c routino-2.0.3-rev855/src/superx.c
+--- routino-2.0.3/src/superx.c	2011-08-01 20:21:22.000000000 +0200
++++ routino-2.0.3-rev855/src/superx.c	2011-10-30 15:54:24.000000000 +0100
+@@ -435,7 +435,7 @@
+ 
+  /* Insert the first node into the queue */
+ 
+- results=NewResultsList(8);
++ results=NewResultsList(64);
+ 
+  queue=NewQueueList();
+ 
diff --git a/routino.spec b/routino.spec
index e041c13..63f5317 100644
--- a/routino.spec
+++ b/routino.spec
@@ -1,7 +1,7 @@
 Name: routino
 Summary: Router for OpenStreetMap Data
 Version: 2.0.3
-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.2-makefiles.patch
 # remove references to INSTALL.txt/installation.html which we don't ship
 Patch1: routino-1.5.1-no-install-doc.patch
+# upstream patch to increase hash table sizes (factor 5 speedup in routing)
+Patch100: routino-2.0.3-rev855.patch
 BuildRequires: flex
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -22,6 +24,7 @@ can be used as a routing tool in Marble.
 
 %prep
 %setup -q
+%patch100 -p1 -b .rev855
 cp -p %{SOURCE1} doc/
 %patch0 -p1 -b .makefiles
 # Get rid of installation documentation which is not applicable to the RPM
@@ -49,6 +52,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/
 
 %changelog
+* Sun Oct 30 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.3-2
+- Add upstream patch to increase hash table sizes (factor 5 speedup in routing)
+
 * Fri Aug 05 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.3-1
 - Update to 2.0.3 (#728490, bugfix release)