[routino] * Thu Oct 27 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1.1-1 - Update to 2.1.1 (#748392) - READ

Kevin Kofler kkofler at fedoraproject.org
Thu Oct 27 15:24:39 UTC 2011 

commit 203dbcbf33f1081147a9815559456e124a3a82c0
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Thu Oct 27 17:24:18 2011 +0200

    * Thu Oct 27 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1.1-1
    - Update to 2.1.1 (#748392)
    - README-MARBLE.txt: update version number reference (2.1 → 2.1.x)
    - Drop filedumper-printf patch, fixed upstream
    - Rebase makefiles patch, upstream fixed a makefile bug

 .gitignore                                         |    1 +
 README-MARBLE.txt                                  |    2 +-
 routino-2.1-filedumper-printf.patch                |   39 -------------
 ...akefiles.patch => routino-2.1.1-makefiles.patch |   59 ++++++++++----------
 routino.spec                                       |   15 +++--
 sources                                            |    2 +-
 6 files changed, 41 insertions(+), 77 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0c5e5fe..745a997 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /routino-2.0.2.tgz
 /routino-2.0.3.tgz
 /routino-2.1.tgz
+/routino-2.1.1.tgz
diff --git a/README-MARBLE.txt b/README-MARBLE.txt
index 587b8c9..d044cdf 100644
--- a/README-MARBLE.txt
+++ b/README-MARBLE.txt
@@ -3,7 +3,7 @@ SETTING UP ROUTINO FOR USE WITH MARBLE
 
 IMPORTANT: If you are upgrading from a release of Routino prior to 2.1, you MUST
            run these steps (at least step 4) again. Existing .mem files from
-           previous releases of Routino cannot be used with version 2.1.
+           previous releases of Routino cannot be used with version 2.1.x.
 
 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.1-makefiles.patch b/routino-2.1.1-makefiles.patch
similarity index 76%
rename from routino-2.1-makefiles.patch
rename to routino-2.1.1-makefiles.patch
index 9446dea..4be5551 100644
--- a/routino-2.1-makefiles.patch
+++ b/routino-2.1.1-makefiles.patch
@@ -1,6 +1,6 @@
-diff -ur routino-2.1/doc/Makefile routino-2.1-makefiles/doc/Makefile
---- routino-2.1/doc/Makefile	2011-05-17 18:45:09.000000000 +0200
-+++ routino-2.1-makefiles/doc/Makefile	2011-10-15 03:05:20.000000000 +0200
+diff -ur routino-2.1.1/doc/Makefile routino-2.1.1-makefiles/doc/Makefile
+--- routino-2.1.1/doc/Makefile	2011-10-06 10:05:33.000000000 +0200
++++ routino-2.1.1-makefiles/doc/Makefile	2011-10-27 17:08:04.000000000 +0200
 @@ -24,9 +24,9 @@
  
  # Files to install
@@ -24,7 +24,7 @@ diff -ur routino-2.1/doc/Makefile routino-2.1-makefiles/doc/Makefile
  	     fi ;\
  	  done
  
-@@ -45,19 +45,19 @@
+@@ -49,19 +49,19 @@
  	-[ -d $(DESTDIR)$(docdir) ] || mkdir -p $(DESTDIR)$(docdir)
  	@[ -d $(DESTDIR)$(docdir) ] && \
  	  for file in $(TOP_FILES); do \
@@ -50,10 +50,10 @@ diff -ur routino-2.1/doc/Makefile routino-2.1-makefiles/doc/Makefile
  	  done
  
  ########
-diff -ur routino-2.1/Makefile routino-2.1-makefiles/Makefile
---- routino-2.1/Makefile	2010-12-29 11:46:45.000000000 +0100
-+++ routino-2.1-makefiles/Makefile	2011-10-15 03:05:20.000000000 +0200
-@@ -22,9 +22,9 @@
+diff -ur routino-2.1.1/Makefile routino-2.1.1-makefiles/Makefile
+--- routino-2.1.1/Makefile	2011-10-15 16:48:42.000000000 +0200
++++ routino-2.1.1-makefiles/Makefile	2011-10-27 17:08:04.000000000 +0200
+@@ -20,9 +20,9 @@
  
  # Installation locations
  
@@ -65,9 +65,9 @@ diff -ur routino-2.1/Makefile routino-2.1-makefiles/Makefile
  datadir=$(prefix)/share/routino
  
  # Sub-directories and sub-makefiles
-diff -ur routino-2.1/src/Makefile routino-2.1-makefiles/src/Makefile
---- routino-2.1/src/Makefile	2011-10-03 11:53:45.000000000 +0200
-+++ routino-2.1-makefiles/src/Makefile	2011-10-15 03:05:20.000000000 +0200
+diff -ur routino-2.1.1/src/Makefile routino-2.1.1-makefiles/src/Makefile
+--- routino-2.1.1/src/Makefile	2011-10-06 10:05:47.000000000 +0200
++++ routino-2.1.1-makefiles/src/Makefile	2011-10-27 17:11:32.000000000 +0200
 @@ -31,18 +31,8 @@
  
  # Compilation program options
@@ -79,11 +79,11 @@ diff -ur routino-2.1/src/Makefile routino-2.1-makefiles/src/Makefile
 -CFLAGS+= -O3
 -#CFLAGS+= -O0 -g
 -#CFLAGS+= -pg
--#CFLAGS+= --coverage
+-#CFLAGS+= -fprofile-arcs -ftest-coverage
 -
 -LDFLAGS+=
 -#LDFLAGS+= -pg -static
--#LDFLAGS+= --coverage
+-#LDFLAGS+= -fprofile-arcs -ftest-coverage
 +CFLAGS+=-Wall -Wmissing-prototypes -std=c99
 +LDFLAGS+=-lm -lc
  
@@ -110,7 +110,7 @@ diff -ur routino-2.1/src/Makefile routino-2.1-makefiles/src/Makefile
  	@echo Created xmlparse.c
  
  ########
-@@ -166,8 +155,8 @@
+@@ -172,8 +161,8 @@
  	-[ -d $(DESTDIR)$(bindir) ] || mkdir -p $(DESTDIR)$(bindir)
  	@[ -d $(DESTDIR)$(bindir) ] && \
  	  for file in $(EXE); do \
@@ -121,9 +121,9 @@ diff -ur routino-2.1/src/Makefile routino-2.1-makefiles/src/Makefile
  	  done
  
  ########
-diff -ur routino-2.1/src/xml/Makefile routino-2.1-makefiles/src/xml/Makefile
---- routino-2.1/src/xml/Makefile	2011-01-29 20:43:06.000000000 +0100
-+++ routino-2.1-makefiles/src/xml/Makefile	2011-10-15 03:05:20.000000000 +0200
+diff -ur routino-2.1.1/src/xml/Makefile routino-2.1.1-makefiles/src/xml/Makefile
+--- routino-2.1.1/src/xml/Makefile	2011-10-06 10:06:19.000000000 +0200
++++ routino-2.1.1-makefiles/src/xml/Makefile	2011-10-27 17:08:04.000000000 +0200
 @@ -25,8 +25,8 @@
  
  # Program options
@@ -135,12 +135,12 @@ diff -ur routino-2.1/src/xml/Makefile routino-2.1-makefiles/src/xml/Makefile
  
  # Required to use stdio with files > 2GiB on 32-bit system.
  
-diff -ur routino-2.1/xml/Makefile routino-2.1-makefiles/xml/Makefile
---- routino-2.1/xml/Makefile	2011-09-05 20:12:00.000000000 +0200
-+++ routino-2.1-makefiles/xml/Makefile	2011-10-15 03:15:57.000000000 +0200
-@@ -39,17 +39,19 @@
- 	-@[ -d $(WEBDATADIR) ] && \
- 	  for file in $(STANDARD_FILES); do \
+diff -ur routino-2.1.1/xml/Makefile routino-2.1.1-makefiles/xml/Makefile
+--- routino-2.1.1/xml/Makefile	2011-10-16 19:44:56.000000000 +0200
++++ routino-2.1.1-makefiles/xml/Makefile	2011-10-27 17:14:00.000000000 +0200
+@@ -38,17 +38,19 @@
+ all: $(SPECIAL_FILES)
+ 	- at for file in $(STANDARD_FILES); do \
  	     if [ ! -f $(WEBDATADIR)/$$file ] || [ routino-$$file -nt $(WEBDATADIR)/$$file ]; then \
 -	        echo cp routino-$$file $(WEBDATADIR)/$$file ;\
 -	        cp -f routino-$$file $(WEBDATADIR)/$$file ;\
@@ -164,19 +164,18 @@ diff -ur routino-2.1/xml/Makefile routino-2.1-makefiles/xml/Makefile
  	     [ $(WEBDATADIR)/profiles.xml -nt $(WEBWWWDIR)/profiles.pl ] || \
  	     [ $(WEBDATADIR)/profiles.xml -nt $(WEBWWWDIR)/profiles.js ]; then \
  	     echo perl update-profiles.pl ;\
-@@ -72,9 +74,14 @@
+@@ -75,12 +77,12 @@
  install: all
  	-[ -d $(DESTDIR)$(datadir) ] || mkdir -p $(DESTDIR)$(datadir)
- 	@[ -d $(DESTDIR)$(datadir) ] && \
--	  for file in $(STANDARD_FILES) $(SPECIAL_FILES); do \
+ 	- at for file in $(STANDARD_FILES) ; do \
 -	     echo cp routino-$$file $(DESTDIR)$(datadir)/$$file ;\
 -	     cp -f routino-$$file $(DESTDIR)$(datadir)/$$file ;\
-+	  for file in $(STANDARD_FILES); do \
 +	     echo cp -pf routino-$$file $(DESTDIR)$(datadir)/$$file ;\
 +	     cp -pf routino-$$file $(DESTDIR)$(datadir)/$$file ;\
-+	  done
-+	@[ -d $(DESTDIR)$(datadir) ] && \
-+	  for file in $(SPECIAL_FILES); do \
+ 	  done
+ 	- at 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.spec b/routino.spec
index dcd095e..382b523 100644
--- a/routino.spec
+++ b/routino.spec
@@ -1,7 +1,7 @@
 Name: routino
 Summary: Router for OpenStreetMap Data
-Version: 2.1
-Release: 2%{?dist}
+Version: 2.1.1
+Release: 1%{?dist}
 License: AGPLv3+
 Group: Applications/Productivity
 URL: http://www.routino.org/
@@ -9,11 +9,9 @@ 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.1-makefiles.patch
+Patch0: routino-2.1.1-makefiles.patch
 # remove references to INSTALL.txt/installation.html which we don't ship
 Patch1: routino-1.5.1-no-install-doc.patch
-# fix filedumper.c printf format string warnings (fatal on 64-bit BE platforms)
-Patch2: routino-2.1-filedumper-printf.patch
 BuildRequires: flex
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -26,7 +24,6 @@ can be used as a routing tool in Marble.
 %setup -q
 cp -p %{SOURCE1} doc/
 %patch0 -p1 -b .makefiles
-%patch2 -p1 -b .filedumper-printf
 # 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
@@ -52,6 +49,12 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/
 
 %changelog
+* Thu Oct 27 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1.1-1
+- Update to 2.1.1 (#748392)
+- README-MARBLE.txt: update version number reference (2.1 → 2.1.x)
+- Drop filedumper-printf patch, fixed upstream
+- Rebase makefiles patch, upstream fixed a makefile bug
+
 * Sat Oct 15 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1-2
 - Fix filedumper.c printf format string warnings (fatal on 64-bit BE platforms)
 
diff --git a/sources b/sources
index f3e6fc5..5e6fef6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-63f257e98d454784f53678a6dce2d7ca  routino-2.1.tgz
+24abd30b8c1b2dee1ac5d526c1110651  routino-2.1.1.tgz

More information about the scm-commits mailing list