[routino] * Thu Nov 17 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1.2-1 - Update to 2.1.2 (#753752, bugfix

Kevin Kofler kkofler at fedoraproject.org
Thu Nov 17 20:17:24 UTC 2011 

commit 609afc8fc8db3a2df5a76e052e6d0c6cbce7527c
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Thu Nov 17 21:17:08 2011 +0100

    * Thu Nov 17 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1.2-1
    - Update to 2.1.2 (#753752, bugfix release)

 .gitignore                                         |    1 +
 ...akefiles.patch => routino-2.1.2-makefiles.patch |   65 ++++++++++---------
 routino.spec                                       |    9 ++-
 sources                                            |    2 +-
 4 files changed, 42 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 745a997..008c9b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /routino-2.0.3.tgz
 /routino-2.1.tgz
 /routino-2.1.1.tgz
+/routino-2.1.2.tgz
diff --git a/routino-2.1.1-makefiles.patch b/routino-2.1.2-makefiles.patch
similarity index 77%
rename from routino-2.1.1-makefiles.patch
rename to routino-2.1.2-makefiles.patch
index e39b47f..b1fcc56 100644
--- a/routino-2.1.1-makefiles.patch
+++ b/routino-2.1.2-makefiles.patch
@@ -1,6 +1,6 @@
-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
+diff -ur routino-2.1.2/doc/Makefile routino-2.1.2-makefiles/doc/Makefile
+--- routino-2.1.2/doc/Makefile	2011-10-06 10:05:33.000000000 +0200
++++ routino-2.1.2-makefiles/doc/Makefile	2011-11-17 21:08:06.000000000 +0100
 @@ -24,9 +24,9 @@
  
  # Files to install
@@ -50,9 +50,9 @@ diff -ur routino-2.1.1/doc/Makefile routino-2.1.1-makefiles/doc/Makefile
  	  done
  
  ########
-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
+diff -ur routino-2.1.2/Makefile routino-2.1.2-makefiles/Makefile
+--- routino-2.1.2/Makefile	2011-10-15 16:48:42.000000000 +0200
++++ routino-2.1.2-makefiles/Makefile	2011-11-17 21:08:06.000000000 +0100
 @@ -20,9 +20,9 @@
  
  # Installation locations
@@ -65,31 +65,31 @@ diff -ur routino-2.1.1/Makefile routino-2.1.1-makefiles/Makefile
  datadir=$(prefix)/share/routino
  
  # Sub-directories and sub-makefiles
-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
+diff -ur routino-2.1.2/src/Makefile routino-2.1.2-makefiles/src/Makefile
+--- routino-2.1.2/src/Makefile	2011-10-31 20:13:23.000000000 +0100
++++ routino-2.1.2-makefiles/src/Makefile	2011-11-17 21:09:29.000000000 +0100
 @@ -31,18 +31,8 @@
  
  # Compilation program options
  
 -CFLAGS=-Wall -Wmissing-prototypes -std=c99
--#CFLAGS+= -Wextra -pedantic
+-#CFLAGS+=-Wextra -pedantic
 -LDFLAGS=-lm -lc
 -
--CFLAGS+= -O3
--#CFLAGS+= -O0 -g
--#CFLAGS+= -pg
--#CFLAGS+= -fprofile-arcs -ftest-coverage
+-CFLAGS+=-O3
+-#CFLAGS+=-O0 -g
+-#CFLAGS+=-pg
+-#CFLAGS+=-fprofile-arcs -ftest-coverage
 -
 -LDFLAGS+=
--#LDFLAGS+= -pg -static
--#LDFLAGS+= -fprofile-arcs -ftest-coverage
+-#LDFLAGS+=-pg -static
+-#LDFLAGS+=-fprofile-arcs -ftest-coverage
 +CFLAGS+=-Wall -Wmissing-prototypes -std=c99
 +LDFLAGS+=-lm -lc
  
  LEXFLAGS=
  
-@@ -63,8 +53,8 @@
+@@ -65,8 +55,8 @@
  	-@[ -d $(WEBDIR) ] && \
  	  for file in $(EXE); do \
  	     if [ ! -f $(WEBDIR)/$$file ] || [ $$file -nt $(WEBDIR)/$$file ]; then \
@@ -100,7 +100,7 @@ diff -ur routino-2.1.1/src/Makefile routino-2.1.1-makefiles/src/Makefile
  	     fi ;\
  	  done
  	@cd xml  && $(MAKE) CC="$(CC)" LD="$(LD)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
-@@ -148,8 +138,7 @@
+@@ -150,8 +140,7 @@
  ########
  
  xmlparse.c : xmlparse.l
@@ -110,7 +110,7 @@ diff -ur routino-2.1.1/src/Makefile routino-2.1.1-makefiles/src/Makefile
  	@echo Created xmlparse.c
  
  ########
-@@ -172,8 +161,8 @@
+@@ -174,8 +163,8 @@
  	-[ -d $(DESTDIR)$(bindir) ] || mkdir -p $(DESTDIR)$(bindir)
  	@[ -d $(DESTDIR)$(bindir) ] && \
  	  for file in $(EXE); do \
@@ -121,24 +121,27 @@ diff -ur routino-2.1.1/src/Makefile routino-2.1.1-makefiles/src/Makefile
  	  done
  
  ########
-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 @@
+diff -ur routino-2.1.2/src/xml/Makefile routino-2.1.2-makefiles/src/xml/Makefile
+--- routino-2.1.2/src/xml/Makefile	2011-10-31 20:04:31.000000000 +0100
++++ routino-2.1.2-makefiles/src/xml/Makefile	2011-11-17 21:13:33.000000000 +0100
+@@ -25,11 +25,8 @@
  
  # Program options
  
--CFLAGS=-Wall -Wmissing-prototypes -O0 -g
+-CFLAGS=-Wall -Wmissing-prototypes -std=c99
+-#CFLAGS+=-Wextra -pedantic
 -LDFLAGS=-lm -lc
-+CFLAGS+=-Wall -Wmissing-prototypes
+-
+-CFLAGS+=-O3
++CFLAGS+=-Wall -Wmissing-prototypes -std=c99
 +LDFLAGS+=-lm -lc
  
  # Required to use stdio with files > 2GiB on 32-bit system.
- 
-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:42:41.000000000 +0200
-@@ -36,19 +36,22 @@
+ CFLAGS+=-D_FILE_OFFSET_BITS=64
+diff -ur routino-2.1.2/xml/Makefile routino-2.1.2-makefiles/xml/Makefile
+--- routino-2.1.2/xml/Makefile	2011-11-08 10:32:43.000000000 +0100
++++ routino-2.1.2-makefiles/xml/Makefile	2011-11-17 21:08:06.000000000 +0100
+@@ -39,19 +39,22 @@
  ########
  
  all: $(SPECIAL_FILES)
@@ -168,7 +171,7 @@ diff -ur routino-2.1.1/xml/Makefile routino-2.1.1-makefiles/xml/Makefile
  	     [ $(WEBDATADIR)/profiles.xml -nt $(WEBWWWDIR)/profiles.pl ] || \
  	     [ $(WEBDATADIR)/profiles.xml -nt $(WEBWWWDIR)/profiles.js ]; then \
  	     echo perl update-profiles.pl ;\
-@@ -75,12 +78,12 @@
+@@ -78,12 +81,12 @@
  install: all
  	-[ -d $(DESTDIR)$(datadir) ] || mkdir -p $(DESTDIR)$(datadir)
  	- at for file in $(STANDARD_FILES) ; do \
diff --git a/routino.spec b/routino.spec
index ffba2f4..e8ca98b 100644
--- a/routino.spec
+++ b/routino.spec
@@ -1,7 +1,7 @@
 Name: routino
 Summary: Router for OpenStreetMap Data
-Version: 2.1.1
-Release: 2%{?dist}
+Version: 2.1.2
+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.1.1-makefiles.patch
+Patch0: routino-2.1.2-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,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/
 
 %changelog
+* Thu Nov 17 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1.2-1
+- Update to 2.1.2 (#753752, bugfix release)
+
 * Thu Oct 27 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1.1-2
 - makefiles patch: add one more check for WEBDATADIR existence
 
diff --git a/sources b/sources
index 5e6fef6..5ce5b5f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-24abd30b8c1b2dee1ac5d526c1110651  routino-2.1.1.tgz
+426469791cc98ac317caad9e4a996eee  routino-2.1.2.tgz

More information about the scm-commits mailing list