[routino] * Sat Oct 15 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1-2 - Fix filedumper.c printf format str
Kevin Kofler
kkofler at fedoraproject.org
Sat Oct 15 01:47:54 UTC 2011
commit d47e2f1610b5c663bacf193741fb468b35ebc4a6
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sat Oct 15 03:47:45 2011 +0200
* 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)
routino-2.1-filedumper-printf.patch | 39 +++++++++++++++++++++++++++++++++++
routino.spec | 8 ++++++-
2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/routino-2.1-filedumper-printf.patch b/routino-2.1-filedumper-printf.patch
new file mode 100644
index 0000000..cd8fc3a
--- /dev/null
+++ b/routino-2.1-filedumper-printf.patch
@@ -0,0 +1,39 @@
+diff -ur routino-2.1/src/filedumper.c routino-2.1-filedumper-printf/src/filedumper.c
+--- routino-2.1/src/filedumper.c 2011-09-07 15:01:57.000000000 +0200
++++ routino-2.1-filedumper-printf/src/filedumper.c 2011-10-15 03:39:45.000000000 +0200
+@@ -206,7 +206,7 @@
+ printf("-----\n");
+ printf("\n");
+
+- printf("sizeof(Node) =%9d Bytes\n",sizeof(Node));
++ printf("sizeof(Node) =%9lu Bytes\n",(unsigned long)sizeof(Node));
+ printf("Number =%9d\n",OSMNodes->file.number);
+ printf("Number(super)=%9d\n",OSMNodes->file.snumber);
+ printf("\n");
+@@ -225,7 +225,7 @@
+ printf("--------\n");
+ printf("\n");
+
+- printf("sizeof(Segment)=%9d Bytes\n",sizeof(Segment));
++ printf("sizeof(Segment)=%9lu Bytes\n",(unsigned long)sizeof(Segment));
+ printf("Number(total) =%9d\n",OSMSegments->file.number);
+ printf("Number(super) =%9d\n",OSMSegments->file.snumber);
+ printf("Number(normal) =%9d\n",OSMSegments->file.nnumber);
+@@ -237,7 +237,7 @@
+ printf("----\n");
+ printf("\n");
+
+- printf("sizeof(Way) =%9d Bytes\n",sizeof(Way));
++ printf("sizeof(Way) =%9lu Bytes\n",(unsigned long)sizeof(Way));
+ printf("Number(compacted)=%9d\n",OSMWays->file.number);
+ printf("Number(original) =%9d\n",OSMWays->file.onumber);
+ printf("\n");
+@@ -257,7 +257,7 @@
+ printf("---------\n");
+ printf("\n");
+
+- printf("sizeof(TurnRelation)=%9d Bytes\n",sizeof(TurnRelation));
++ printf("sizeof(TurnRelation)=%9lu Bytes\n",(unsigned long)sizeof(TurnRelation));
+ printf("Number =%9d\n",OSMRelations->file.trnumber);
+ }
+
diff --git a/routino.spec b/routino.spec
index 5c4c171..dcd095e 100644
--- a/routino.spec
+++ b/routino.spec
@@ -1,7 +1,7 @@
Name: routino
Summary: Router for OpenStreetMap Data
Version: 2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: AGPLv3+
Group: Applications/Productivity
URL: http://www.routino.org/
@@ -12,6 +12,8 @@ Source1: README-MARBLE.txt
Patch0: routino-2.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)
@@ -24,6 +26,7 @@ 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
@@ -49,6 +52,9 @@ rm -rf %{buildroot}
%{_datadir}/%{name}/
%changelog
+* 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)
+
* Sat Oct 15 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.1-1
- Update to 2.1 (#742903)
- README-MARBLE.txt: update: data files from 2.0(.x) versions no longer work
More information about the scm-commits
mailing list