commit 03c5c5497cd1882d463ebf98b66e989368a2900b Author: Kevin Kofler Kevin@tigcc.ticalc.org Date: Sun Jun 1 00:20:38 2014 +0200
Update to 2.7 (last version compatible with databases from 2.6)
* Sat May 31 2014 Kevin Kofler Kevin@tigcc.ticalc.org - 2.7-1 - Update to 2.7 (last version compatible with databases from 2.6) - Rebase patches - Enable xz support, BuildRequires: xz-devel - README-MARBLE.txt: update: 2.6 database compatibility, .xz support
.gitignore | 1 + README-MARBLE.txt | 9 +- routino-2.6-makefiles.patch | 201 -------------------- routino-2.7-makefiles.patch | 161 ++++++++++++++++ ...l-doc.patch => routino-2.7-no-install-doc.patch | 26 ++-- routino.spec | 16 +- sources | 2 +- 7 files changed, 192 insertions(+), 224 deletions(-) --- diff --git a/.gitignore b/.gitignore index 3f0dd58..e32ebd8 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /routino-2.5.tgz /routino-2.5.1.tgz /routino-2.6.tgz +/routino-2.7.tgz diff --git a/README-MARBLE.txt b/README-MARBLE.txt index ecd25cc..a8f8e13 100644 --- a/README-MARBLE.txt +++ b/README-MARBLE.txt @@ -3,7 +3,9 @@ SETTING UP ROUTINO FOR USE WITH MARBLE
IMPORTANT: If you are upgrading from a release of Routino prior to 2.6, you MUST run these steps (at least step 4) again. Existing .mem files from - previous releases of Routino cannot be used with version 2.6. + previous releases of Routino cannot be used with version 2.6 or 2.7. + Databases from version 2.6 can be used, but cycling against oneways + (new feature in 2.7) will not work until the database is regenerated.
Since Marble 1.0.0 (kdeedu 4.6.0), Marble supports computing routes using Routino. The following instructions describe how to set that up: @@ -17,9 +19,8 @@ Routino. The following instructions describe how to set that up:
IMPORTANT: * Starting from version 2.5, Routino supports the new binary .osm.pbf format, - as well as any compressed .gz or .bz2 input. (xz is NOT supported yet - though.) Therefore, no advance conversion (pbf2osm) nor decompression - should be needed anymore. + as well as any compressed .gz, .bz2 or, since 2.7, .xz input. Therefore, no + advance conversion (pbf2osm) nor decompression should be needed anymore. * The larger the chosen map extract, the longer it takes to download and process. The processing time is not negligible, e.g. austria.osm.bz2 takes several minutes to download and approximately 50 minutes to process on a diff --git a/routino-2.7-makefiles.patch b/routino-2.7-makefiles.patch new file mode 100644 index 0000000..9b7fe20 --- /dev/null +++ b/routino-2.7-makefiles.patch @@ -0,0 +1,161 @@ +diff -ur routino-2.7/doc/Makefile routino-2.7-makefiles/doc/Makefile +--- routino-2.7/doc/Makefile 2014-03-22 12:28:26.000000000 +0100 ++++ routino-2.7-makefiles/doc/Makefile 2014-06-01 00:03:49.000000000 +0200 +@@ -24,9 +24,9 @@ + + # Files to install + +-HTML_FILES=$(notdir $(wildcard html/*.html)) $(notdir $(wildcard html/*.css)) ++HTML_FILES=html/*.html html/*.css html/*.png + TXT_FILES=*.txt +-TOP_FILES=../agpl-3.0.txt ++TOP_FILES=../agpl-3.0.txt ../ChangeLog + + ######## + +@@ -43,19 +43,19 @@ + install-txt: + @[ -d $(DESTDIR)$(docdir) ] || mkdir -p $(DESTDIR)$(docdir) + @for file in $(TOP_FILES); do \ +- echo cp $$file $(DESTDIR)$(docdir) ;\ +- cp -f $$file $(DESTDIR)$(docdir) ;\ ++ echo cp -pf $$file $(DESTDIR)$(docdir) ;\ ++ cp -pf $$file $(DESTDIR)$(docdir) ;\ + done + @for file in $(TXT_FILES); do \ +- echo cp $$file $(DESTDIR)$(docdir) ;\ +- cp -f $$file $(DESTDIR)$(docdir) ;\ ++ echo cp -pf $$file $(DESTDIR)$(docdir) ;\ ++ cp -pf $$file $(DESTDIR)$(docdir) ;\ + done + + install-html: + @[ -d $(DESTDIR)$(docdir)/html ] || mkdir -p $(DESTDIR)$(docdir)/html + @for file in $(HTML_FILES); do \ +- echo cp html/$$file $(DESTDIR)$(docdir)/html ;\ +- cp -f html/$$file $(DESTDIR)$(docdir)/html ;\ ++ echo cp -pf $$file $(DESTDIR)$(docdir)/html ;\ ++ cp -pf $$file $(DESTDIR)$(docdir)/html ;\ + done + + ######## +diff -ur routino-2.7/Makefile.conf routino-2.7-makefiles/Makefile.conf +--- routino-2.7/Makefile.conf 2014-03-11 19:19:37.000000000 +0100 ++++ routino-2.7-makefiles/Makefile.conf 2014-06-01 00:06:05.000000000 +0200 +@@ -20,9 +20,9 @@ + + # Installation locations (edit if required) + +-prefix=/usr/local ++prefix=/usr + bindir=$(prefix)/bin +-docdir=$(prefix)/doc/routino ++docdir=$(prefix)/share/doc/routino + datadir=$(prefix)/share/routino + + +@@ -33,13 +33,12 @@ + + + # Language dialect selection +-CFLAGS=-std=c99 ++CFLAGS+=-std=c99 + + # Warning options + CFLAGS+=-Wall -Wmissing-prototypes -Wextra -Wno-unused-parameter + + # Optimisation options +-CFLAGS+=-O3 + CFLAGS+=-ffast-math + + # Optimisation option (only works if compilation and execution use exactly the same CPU architecture). +@@ -50,7 +49,7 @@ + + + # Maths library +-LDFLAGS=-lm ++LDFLAGS+=-lm + + + # Required for multi-threaded support (comment these two lines out if not required) +@@ -68,9 +67,9 @@ + LDFLAGS+=-lz + + +-# Required for xz support (uncomment these two lines if required) +-#CFLAGS+=-DUSE_XZ +-#LDFLAGS+=-llzma ++# Required for xz support (comment these two lines out if not required) ++CFLAGS+=-DUSE_XZ ++LDFLAGS+=-llzma + + + # Required to use stdio with files > 2GiB on 32-bit system. +diff -ur routino-2.7/src/Makefile routino-2.7-makefiles/src/Makefile +--- routino-2.7/src/Makefile 2014-03-22 12:34:20.000000000 +0100 ++++ routino-2.7-makefiles/src/Makefile 2014-06-01 00:08:39.000000000 +0200 +@@ -62,7 +62,7 @@ + xmlparse.o tagging.o \ + uncompress.o osmxmlparse.o osmpbfparse.o osmo5mparse.o osmparser.o + +-planetsplitter : $(PLANETSPLITTER_OBJ) ++planetsplitter : $(PLANETSPLITTER_OBJ) .deps + $(LD) $(PLANETSPLITTER_OBJ) -o $@ $(LDFLAGS) + + ######## +@@ -130,12 +130,10 @@ + + ######## + +-%.o : %.c +- @[ -d .deps ] || mkdir .deps ++%.o : %.c .deps + $(CC) -c $(CFLAGS) -DSLIM=0 -DDATADIR="$(datadir)" $< -o $@ -MMD -MP -MF $(addprefix .deps/,$(addsuffix .d,$(basename $@))) + +-%-slim.o : %.c +- @[ -d .deps ] || mkdir .deps ++%-slim.o : %.c .deps + $(CC) -c $(CFLAGS) -DSLIM=1 -DDATADIR="$(datadir)" $< -o $@ -MMD -MP -MF $(addprefix .deps/,$(addsuffix .d,$(basename $@))) + + ######## +@@ -157,8 +155,8 @@ + install-local: all-local + @[ -d $(DESTDIR)$(bindir) ] || mkdir -p $(DESTDIR)$(bindir) + @for file in $(EXE); do \ +- echo cp $$file $(DESTDIR)$(bindir) ;\ +- cp -f $$file $(DESTDIR)$(bindir) ;\ ++ echo install -p $$file $(DESTDIR)$(bindir)/routino-$$file ;\ ++ install -p $$file $(DESTDIR)$(bindir)/routino-$$file ;\ + done + + ######## +@@ -188,6 +186,9 @@ + + ######## + ++.deps: ++ @[ -d .deps ] || mkdir $@ ++ + include $(D) + + ######## +diff -ur routino-2.7/xml/Makefile routino-2.7-makefiles/xml/Makefile +--- routino-2.7/xml/Makefile 2014-03-22 12:37:54.000000000 +0100 ++++ routino-2.7-makefiles/xml/Makefile 2014-06-01 00:10:31.000000000 +0200 +@@ -56,12 +56,12 @@ + install: all + @[ -d $(DESTDIR)$(datadir) ] || mkdir -p $(DESTDIR)$(datadir) + @for file in $(STANDARD_FILES) ; do \ +- echo cp routino-$$file $(DESTDIR)$(datadir)/$$file ;\ +- cp -f routino-$$file $(DESTDIR)$(datadir)/$$file ;\ ++ echo cp -pf routino-$$file $(DESTDIR)$(datadir)/$$file ;\ ++ cp -pf routino-$$file $(DESTDIR)$(datadir)/$$file ;\ + done + @for file in $(SPECIAL_FILES); do \ +- echo cp $$file $(DESTDIR)$(datadir)/$$file ;\ +- cp -f $$file $(DESTDIR)$(datadir)/$$file ;\ ++ echo cp -pf $$file $(DESTDIR)$(datadir)/$$file ;\ ++ cp -pf $$file $(DESTDIR)$(datadir)/$$file ;\ + done + + ######## diff --git a/routino-2.5-no-install-doc.patch b/routino-2.7-no-install-doc.patch similarity index 55% rename from routino-2.5-no-install-doc.patch rename to routino-2.7-no-install-doc.patch index 21a971f..555f754 100644 --- a/routino-2.5-no-install-doc.patch +++ b/routino-2.7-no-install-doc.patch @@ -1,11 +1,11 @@ -diff -ur routino-2.5/doc/html/index.html routino-2.5-no-install-doc/doc/html/index.html ---- routino-2.5/doc/html/index.html 2013-02-08 18:33:28.000000000 +0100 -+++ routino-2.5-no-install-doc/doc/html/index.html 2013-02-15 06:45:50.000000000 +0100 -@@ -101,14 +101,6 @@ +diff -ur routino-2.7/doc/html/index.html routino-2.7-no-install-doc/doc/html/index.html +--- routino-2.7/doc/html/index.html 2013-12-31 11:16:27.000000000 +0100 ++++ routino-2.7-no-install-doc/doc/html/index.html 2014-05-31 23:58:06.000000000 +0200 +@@ -103,14 +103,6 @@ important information for rapid routing.
--<h2><a name="H_1_8"></a>Installation</h2> +-<h2 id="H_1_8">Installation</h2> - -The Routino source code comes with a set of files that can be used to create -a working server very easily. The full information about @@ -16,10 +16,10 @@ diff -ur routino-2.5/doc/html/index.html routino-2.5-no-install-doc/doc/html/ind </div>
<!-- Content End --> -diff -ur routino-2.5/doc/html/readme.html routino-2.5-no-install-doc/doc/html/readme.html ---- routino-2.5/doc/html/readme.html 2013-02-09 13:08:26.000000000 +0100 -+++ routino-2.5-no-install-doc/doc/html/readme.html 2013-02-15 06:44:25.000000000 +0100 -@@ -139,7 +139,7 @@ +diff -ur routino-2.7/doc/html/readme.html routino-2.7-no-install-doc/doc/html/readme.html +--- routino-2.7/doc/html/readme.html 2014-03-22 14:36:07.000000000 +0100 ++++ routino-2.7-no-install-doc/doc/html/readme.html 2014-05-31 23:57:25.000000000 +0200 +@@ -147,7 +147,7 @@
A full set of <a href="index.html" title="Documentation">documentation</a> @@ -28,10 +28,10 @@ diff -ur routino-2.5/doc/html/readme.html routino-2.5-no-install-doc/doc/html/re what should go in the configuration files and how it works.
-diff -ur routino-2.5/doc/README.txt routino-2.5-no-install-doc/doc/README.txt ---- routino-2.5/doc/README.txt 2013-02-09 13:10:35.000000000 +0100 -+++ routino-2.5-no-install-doc/doc/README.txt 2013-02-15 06:44:25.000000000 +0100 -@@ -93,7 +93,7 @@ +diff -ur routino-2.7/doc/README.txt routino-2.7-no-install-doc/doc/README.txt +--- routino-2.7/doc/README.txt 2014-03-22 14:39:08.000000000 +0100 ++++ routino-2.7-no-install-doc/doc/README.txt 2014-05-31 23:57:25.000000000 +0200 +@@ -96,7 +96,7 @@ generated are described in OUTPUT.txt.
Detailed information about how to use the programs is available in the diff --git a/routino.spec b/routino.spec index 9c36798..1842681 100644 --- a/routino.spec +++ b/routino.spec @@ -1,7 +1,7 @@ Name: routino Summary: Router for OpenStreetMap Data -Version: 2.6 -Release: 2%{?dist} +Version: 2.7 +Release: 1%{?dist} License: AGPLv3+ Group: Applications/Productivity URL: http://www.routino.org/ @@ -9,10 +9,10 @@ Source0: http://www.routino.org/download/routino-%%7Bversion%7D.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.6-makefiles.patch +Patch0: routino-2.7-makefiles.patch # remove references to INSTALL.txt/installation.html which we don't ship -Patch1: routino-2.5-no-install-doc.patch -BuildRequires: bzip2-devel zlib-devel +Patch1: routino-2.7-no-install-doc.patch +BuildRequires: bzip2-devel xz-devel zlib-devel BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%description @@ -52,6 +52,12 @@ rm -rf %{buildroot} %{_datadir}/%{name}/
%changelog +* Sat May 31 2014 Kevin Kofler Kevin@tigcc.ticalc.org - 2.7-1 +- Update to 2.7 (last version compatible with databases from 2.6) +- Rebase patches +- Enable xz support, BuildRequires: xz-devel +- README-MARBLE.txt: update: 2.6 database compatibility, .xz support + * Sun Aug 04 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 2.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources index 5f30da4..b02d1f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e2fe8c0bbae5c7c7664bb0ca120687d8 routino-2.6.tgz +60d0571aa13d982da190fca794932856 routino-2.7.tgz
scm-commits@lists.fedoraproject.org
-
Kevin Kofler