[routino] * Mon Jul 11 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.2-1 - Update to 2.0.2 (#716876, bugfix

Kevin Kofler kkofler at fedoraproject.org
Mon Jul 11 07:38:03 UTC 2011


commit f22eb6f7778c0877ea48b0f8aeca46d1d5647a9a
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Mon Jul 11 09:37:25 2011 +0200

    * Mon Jul 11 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.2-1
    - Update to 2.0.2 (#716876, bugfix release)
    - Rebase makefiles patch

 .gitignore                                         |    1 +
 ...akefiles.patch => routino-2.0.2-makefiles.patch |   36 ++++++++++----------
 routino.spec                                       |   10 ++++--
 sources                                            |    2 +-
 4 files changed, 27 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9e07fd7..de0e80d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /routino-1.5.1.tgz
 /routino-2.0.tgz
 /routino-2.0.1.tgz
+/routino-2.0.2.tgz
diff --git a/routino-2.0-makefiles.patch b/routino-2.0.2-makefiles.patch
similarity index 77%
rename from routino-2.0-makefiles.patch
rename to routino-2.0.2-makefiles.patch
index d39343f..dd51b03 100644
--- a/routino-2.0-makefiles.patch
+++ b/routino-2.0.2-makefiles.patch
@@ -1,6 +1,6 @@
-diff -ur routino-2.0/doc/Makefile routino-2.0-makefiles/doc/Makefile
---- routino-2.0/doc/Makefile	2011-05-17 18:45:09.000000000 +0200
-+++ routino-2.0-makefiles/doc/Makefile	2011-05-31 14:35:37.000000000 +0200
+diff -ur routino-2.0.2/doc/Makefile routino-2.0.2-makefiles/doc/Makefile
+--- routino-2.0.2/doc/Makefile	2011-05-17 18:45:09.000000000 +0200
++++ routino-2.0.2-makefiles/doc/Makefile	2011-07-11 09:32:48.000000000 +0200
 @@ -24,9 +24,9 @@
  
  # Files to install
@@ -50,9 +50,9 @@ diff -ur routino-2.0/doc/Makefile routino-2.0-makefiles/doc/Makefile
  	  done
  
  ########
-diff -ur routino-2.0/Makefile routino-2.0-makefiles/Makefile
---- routino-2.0/Makefile	2010-12-29 11:46:45.000000000 +0100
-+++ routino-2.0-makefiles/Makefile	2011-05-31 14:33:45.000000000 +0200
+diff -ur routino-2.0.2/Makefile routino-2.0.2-makefiles/Makefile
+--- routino-2.0.2/Makefile	2010-12-29 11:46:45.000000000 +0100
++++ routino-2.0.2-makefiles/Makefile	2011-07-11 09:32:48.000000000 +0200
 @@ -22,9 +22,9 @@
  
  # Installation locations
@@ -65,15 +65,15 @@ diff -ur routino-2.0/Makefile routino-2.0-makefiles/Makefile
  datadir=$(prefix)/share/routino
  
  # Sub-directories and sub-makefiles
-diff -ur routino-2.0/src/Makefile routino-2.0-makefiles/src/Makefile
---- routino-2.0/src/Makefile	2011-05-30 14:30:21.000000000 +0200
-+++ routino-2.0-makefiles/src/Makefile	2011-05-31 14:33:45.000000000 +0200
+diff -ur routino-2.0.2/src/Makefile routino-2.0.2-makefiles/src/Makefile
+--- routino-2.0.2/src/Makefile	2011-06-25 21:15:17.000000000 +0200
++++ routino-2.0.2-makefiles/src/Makefile	2011-07-11 09:33:42.000000000 +0200
 @@ -31,18 +31,8 @@
  
  # Compilation program options
  
--CFLAGS=-Wall -Wmissing-prototypes
--#CFLAGS+= -Wextra -pedantic -std=c99
+-CFLAGS=-Wall -Wmissing-prototypes -std=c99
+-#CFLAGS+= -Wextra -pedantic
 -LDFLAGS=-lm -lc
 -
 -CFLAGS+= -O3
@@ -84,7 +84,7 @@ diff -ur routino-2.0/src/Makefile routino-2.0-makefiles/src/Makefile
 -LDFLAGS+=
 -#LDFLAGS+= -pg -static
 -#LDFLAGS+= --coverage
-+CFLAGS+=-Wall -Wmissing-prototypes
++CFLAGS+=-Wall -Wmissing-prototypes -std=c99
 +LDFLAGS+=-lm -lc
  
  LEXFLAGS=
@@ -121,9 +121,9 @@ diff -ur routino-2.0/src/Makefile routino-2.0-makefiles/src/Makefile
  	  done
  
  ########
-diff -ur routino-2.0/src/xml/Makefile routino-2.0-makefiles/src/xml/Makefile
---- routino-2.0/src/xml/Makefile	2011-01-29 20:43:06.000000000 +0100
-+++ routino-2.0-makefiles/src/xml/Makefile	2011-05-31 14:33:45.000000000 +0200
+diff -ur routino-2.0.2/src/xml/Makefile routino-2.0.2-makefiles/src/xml/Makefile
+--- routino-2.0.2/src/xml/Makefile	2011-01-29 20:43:06.000000000 +0100
++++ routino-2.0.2-makefiles/src/xml/Makefile	2011-07-11 09:32:48.000000000 +0200
 @@ -25,8 +25,8 @@
  
  # Program options
@@ -135,9 +135,9 @@ diff -ur routino-2.0/src/xml/Makefile routino-2.0-makefiles/src/xml/Makefile
  
  # Required to use stdio with files > 2GiB on 32-bit system.
  
-diff -ur routino-2.0/xml/Makefile routino-2.0-makefiles/xml/Makefile
---- routino-2.0/xml/Makefile	2011-02-23 19:46:44.000000000 +0100
-+++ routino-2.0-makefiles/xml/Makefile	2011-05-31 14:39:06.000000000 +0200
+diff -ur routino-2.0.2/xml/Makefile routino-2.0.2-makefiles/xml/Makefile
+--- routino-2.0.2/xml/Makefile	2011-02-23 19:46:44.000000000 +0100
++++ routino-2.0.2-makefiles/xml/Makefile	2011-07-11 09:32:48.000000000 +0200
 @@ -35,8 +35,8 @@
  	-@[ -d $(WEBDATADIR) ] && \
  	  for file in $(FILES); do \
diff --git a/routino.spec b/routino.spec
index e48a9f5..bd75ea5 100644
--- a/routino.spec
+++ b/routino.spec
@@ -1,7 +1,7 @@
 Name: routino
 Summary: Router for OpenStreetMap Data
-Version: 2.0.1
-Release: 2%{?dist}
+Version: 2.0.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.0-makefiles.patch
+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
 BuildRequires: flex
@@ -49,6 +49,10 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/
 
 %changelog
+* Mon Jul 11 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.2-1
+- Update to 2.0.2 (#716876, bugfix release)
+- Rebase makefiles patch
+
 * Sun Jun 12 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.1-2
 - README-MARBLE.txt: update version number references
 
diff --git a/sources b/sources
index 5050d6c..3df0b20 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1da101fe96617cc40ef82078f6f642e3  routino-2.0.1.tgz
+a9f4eb379f39782ff7d891a44adba43b  routino-2.0.2.tgz


More information about the scm-commits mailing list