[routino] update to 2.3

Kevin Kofler kkofler at fedoraproject.org
Sun Jul 22 00:23:19 UTC 2012 

commit aae6a11754b7e2996c19833708442320f3e115ce
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sun Jul 22 02:22:12 2012 +0200

    update to 2.3
    
    * Sun Jul 22 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.3-1
    - Update to 2.3
    - README-MARBLE.txt: update: data files from 2.2 (probably) no longer work
    - Rebase makefiles patch

 .gitignore                                         |    1 +
 README-MARBLE.txt                                  |    4 +-
 ...-makefiles.patch => routino-2.3-makefiles.patch |   47 ++++++++++----------
 routino.spec                                       |   11 +++-
 sources                                            |    2 +-
 5 files changed, 35 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4dddbb3..9c94c23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /routino-2.1.1.tgz
 /routino-2.1.2.tgz
 /routino-2.2.tgz
+/routino-2.3.tgz
diff --git a/README-MARBLE.txt b/README-MARBLE.txt
index 67fe387..272f2fa 100644
--- a/README-MARBLE.txt
+++ b/README-MARBLE.txt
@@ -1,9 +1,9 @@
 SETTING UP ROUTINO FOR USE WITH MARBLE
 ======================================
 
-IMPORTANT: If you are upgrading from a release of Routino prior to 2.2, you MUST
+IMPORTANT: If you are upgrading from a release of Routino prior to 2.3, you MUST
            run these steps (at least step 4) again. Existing .mem files from
-           previous releases of Routino cannot be used with version 2.2.
+           previous releases of Routino cannot be used with version 2.3.
 
 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.2-makefiles.patch b/routino-2.3-makefiles.patch
similarity index 84%
rename from routino-2.2-makefiles.patch
rename to routino-2.3-makefiles.patch
index eebdba6..18e22d8 100644
--- a/routino-2.2-makefiles.patch
+++ b/routino-2.3-makefiles.patch
@@ -1,6 +1,6 @@
-diff -ur routino-2.2/doc/Makefile routino-2.2-makefiles/doc/Makefile
---- routino-2.2/doc/Makefile	2011-10-06 10:05:33.000000000 +0200
-+++ routino-2.2-makefiles/doc/Makefile	2012-03-05 03:38:03.000000000 +0100
+diff -ur routino-2.3/doc/Makefile routino-2.3-makefiles/doc/Makefile
+--- routino-2.3/doc/Makefile	2011-10-06 10:05:33.000000000 +0200
++++ routino-2.3-makefiles/doc/Makefile	2012-07-22 02:15:47.000000000 +0200
 @@ -24,9 +24,9 @@
  
  # Files to install
@@ -50,9 +50,9 @@ diff -ur routino-2.2/doc/Makefile routino-2.2-makefiles/doc/Makefile
  	  done
  
  ########
-diff -ur routino-2.2/Makefile routino-2.2-makefiles/Makefile
---- routino-2.2/Makefile	2011-11-19 20:51:55.000000000 +0100
-+++ routino-2.2-makefiles/Makefile	2012-03-05 03:38:03.000000000 +0100
+diff -ur routino-2.3/Makefile routino-2.3-makefiles/Makefile
+--- routino-2.3/Makefile	2011-11-19 20:51:55.000000000 +0100
++++ routino-2.3-makefiles/Makefile	2012-07-22 02:15:47.000000000 +0200
 @@ -20,9 +20,9 @@
  
  # Installation locations
@@ -65,31 +65,30 @@ diff -ur routino-2.2/Makefile routino-2.2-makefiles/Makefile
  datadir=$(prefix)/share/routino
  
  # Sub-directories and sub-makefiles
-diff -ur routino-2.2/src/Makefile routino-2.2-makefiles/src/Makefile
---- routino-2.2/src/Makefile	2012-03-03 15:10:25.000000000 +0100
-+++ routino-2.2-makefiles/src/Makefile	2012-03-05 03:40:58.000000000 +0100
-@@ -31,18 +31,8 @@
+diff -ur routino-2.3/src/Makefile routino-2.3-makefiles/src/Makefile
+--- routino-2.3/src/Makefile	2012-05-02 20:09:33.000000000 +0200
++++ routino-2.3-makefiles/src/Makefile	2012-07-22 02:16:55.000000000 +0200
+@@ -31,17 +31,8 @@
  
  # Compilation program options
  
 -CFLAGS=-Wall -Wmissing-prototypes -std=c99
 -#CFLAGS+=-Wextra -pedantic
--LDFLAGS=-lm -lc
+-LDFLAGS=-lm
 -
 -CFLAGS+=-O3
 -#CFLAGS+=-O0 -g
 -#CFLAGS+=-pg
 -#CFLAGS+=-fprofile-arcs -ftest-coverage
 -
--LDFLAGS+=
 -#LDFLAGS+=-pg -static
 -#LDFLAGS+=-fprofile-arcs -ftest-coverage
 +CFLAGS+=-Wall -Wmissing-prototypes -std=c99
-+LDFLAGS+=-lm -lc
++LDFLAGS+=-lm
  
  LEXFLAGS=
  
-@@ -65,8 +55,8 @@
+@@ -68,8 +59,8 @@
  	-@[ -d $(WEBDIR) ] && \
  	  for file in $(EXE); do \
  	     if [ ! -f $(WEBDIR)/$$file ] || [ $$file -nt $(WEBDIR)/$$file ]; then \
@@ -100,7 +99,7 @@ diff -ur routino-2.2/src/Makefile routino-2.2-makefiles/src/Makefile
  	     fi ;\
  	  done
  	@cd xml  && $(MAKE) CC="$(CC)" LD="$(LD)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
-@@ -81,7 +71,7 @@
+@@ -84,7 +75,7 @@
  	           results.o queue.o sorting.o \
  	           xmlparse.o tagging.o osmparser.o
  
@@ -109,7 +108,7 @@ diff -ur routino-2.2/src/Makefile routino-2.2-makefiles/src/Makefile
  	$(LD) $(PLANETSPLITTER_OBJ) -o $@ $(LDFLAGS)
  
  ########
-@@ -150,23 +140,20 @@
+@@ -153,23 +144,20 @@
  ########
  
  xmlparse.c : xmlparse.l
@@ -137,7 +136,7 @@ diff -ur routino-2.2/src/Makefile routino-2.2-makefiles/src/Makefile
  	cd xml  && $(MAKE) test
  	cd test && $(MAKE) test
  
-@@ -176,8 +163,8 @@
+@@ -179,8 +167,8 @@
  	-[ -d $(DESTDIR)$(bindir) ] || mkdir -p $(DESTDIR)$(bindir)
  	@[ -d $(DESTDIR)$(bindir) ] && \
  	  for file in $(EXE); do \
@@ -148,7 +147,7 @@ diff -ur routino-2.2/src/Makefile routino-2.2-makefiles/src/Makefile
  	  done
  
  ########
-@@ -202,9 +189,16 @@
+@@ -205,9 +193,16 @@
  
  ########
  
@@ -165,9 +164,9 @@ diff -ur routino-2.2/src/Makefile routino-2.2-makefiles/src/Makefile
 +
  top=-top
  include ../Makefile
-diff -ur routino-2.2/src/xml/Makefile routino-2.2-makefiles/src/xml/Makefile
---- routino-2.2/src/xml/Makefile	2011-11-20 20:06:50.000000000 +0100
-+++ routino-2.2-makefiles/src/xml/Makefile	2012-03-05 03:38:03.000000000 +0100
+diff -ur routino-2.3/src/xml/Makefile routino-2.3-makefiles/src/xml/Makefile
+--- routino-2.3/src/xml/Makefile	2011-11-20 20:06:50.000000000 +0100
++++ routino-2.3-makefiles/src/xml/Makefile	2012-07-22 02:15:47.000000000 +0200
 @@ -25,11 +25,8 @@
  
  # Program options
@@ -182,9 +181,9 @@ diff -ur routino-2.2/src/xml/Makefile routino-2.2-makefiles/src/xml/Makefile
  
  # Required to use stdio with files > 2GiB on 32-bit system.
  CFLAGS+=-D_FILE_OFFSET_BITS=64
-diff -ur routino-2.2/xml/Makefile routino-2.2-makefiles/xml/Makefile
---- routino-2.2/xml/Makefile	2011-11-19 20:51:30.000000000 +0100
-+++ routino-2.2-makefiles/xml/Makefile	2012-03-05 03:38:03.000000000 +0100
+diff -ur routino-2.3/xml/Makefile routino-2.3-makefiles/xml/Makefile
+--- routino-2.3/xml/Makefile	2011-11-19 20:51:30.000000000 +0100
++++ routino-2.3-makefiles/xml/Makefile	2012-07-22 02:15:47.000000000 +0200
 @@ -39,19 +39,22 @@
  ########
  
diff --git a/routino.spec b/routino.spec
index 9e1baf8..3400760 100644
--- a/routino.spec
+++ b/routino.spec
@@ -1,7 +1,7 @@
 Name: routino
 Summary: Router for OpenStreetMap Data
-Version: 2.2
-Release: 2%{?dist}
+Version: 2.3
+Release: 1%{?dist}
 License: AGPLv3+
 Group: Applications/Productivity
 URL: http://www.routino.org/
@@ -9,7 +9,7 @@ Source0: http://www.routino.org/download/routino-%{version}.tgz
 # documentation for how to set up Routino for use with Marble
 Source1: README-MARBLE.txt
 # customizations/fixes to the (handwritten) makefiles
-Patch0: routino-2.2-makefiles.patch
+Patch0: routino-2.3-makefiles.patch
 # remove references to INSTALL.txt/installation.html which we don't ship
 Patch1: routino-1.5.1-no-install-doc.patch
 BuildRequires: flex
@@ -49,6 +49,11 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/
 
 %changelog
+* Sun Jul 22 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.3-1
+- Update to 2.3
+- README-MARBLE.txt: update: data files from 2.2 (probably) no longer work
+- Rebase makefiles patch
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 94f4202..383a2e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-422f22c4290de5f52cbcea2aa46600ec  routino-2.2.tgz
+c454d9ba2118edfdc5117a8bd6a91d17  routino-2.3.tgz

More information about the scm-commits mailing list