rpms/qlandkarte/F-7 qlandkarte-gcc43.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 qlandkarte.spec, 1.1, 1.2 sources, 1.2, 1.3

[Douglas E. Warner (silfreed)]

Author: silfreed

Update of /cvs/pkgs/rpms/qlandkarte/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2924

Modified Files:
	.cvsignore qlandkarte.spec sources 
Added Files:
	qlandkarte-gcc43.patch 
Log Message:
- upgrade to 0.6.0
- fix compile with gcc 4.3


qlandkarte-gcc43.patch:

--- NEW FILE qlandkarte-gcc43.patch ---
Index: src/device/IDevice.h
===================================================================
--- src/device/IDevice.h	(revision 313)
+++ src/device/IDevice.h	(working copy)
@@ -28,6 +28,9 @@
 #include <string>
 #include <vector>
 
+#include <string.h>
+#include <stdlib.h>
+
 #define INTERFACE_VERSION "01.09"
 
 namespace Garmin


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkarte/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Oct 2007 19:41:21 -0000	1.1
+++ .cvsignore	9 Jan 2008 15:09:36 -0000	1.2
@@ -0,0 +1 @@
+QLandkarte.2007.12.22.tar.gz


Index: qlandkarte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkarte/F-7/qlandkarte.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qlandkarte.spec	23 Oct 2007 11:17:06 -0000	1.1
+++ qlandkarte.spec	9 Jan 2008 15:09:36 -0000	1.2
@@ -1,9 +1,9 @@
 %define cap_name QLandkarte
-%define release_date 2007.09.18
+%define release_date 2007.12.22
 
 Name: qlandkarte
-Version: 0.5.3
-Release: 4%{?dist}
+Version: 0.6.0
+Release: 1%{?dist}
 Summary: A tool to visualize maps and other GPS information for Garmin devices
 
 Group: Applications/Communications
@@ -12,6 +12,7 @@
 Source0: http://downloads.sourceforge.net/%{name}/%{cap_name}.%{release_date}.tar.gz
 Source1: %{name}.desktop
 Source2: %{name}.xpm
+Patch0: %{name}-gcc43.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: qt4-devel proj-devel libusb-devel desktop-file-utils
@@ -22,15 +23,14 @@
 
 %prep
 %setup -q -n %{cap_name}
+%patch0 -p0 -b .gcc43
 
 # fix plugin dir
 sed -i 's|/usr/lib|%{_libdir}|' common
-# remove additional compile flags
-sed -i 's|-O3||' common
 
 
 %build
-qmake-qt4 QLandkarte.pro
+%{_qt4_qmake} QMAKE_CXXFLAGS_RELEASE="%{optflags}" QMAKE_CXXFLAGS_DEBUG="%{optflags}" QLandkarte.pro
 make
 
 
@@ -62,6 +62,10 @@
 
 
 %changelog
+* Thu Jan  3 2008 Dan Horak <dan[at]danny.cz> 0.6.0-1
+- upgrade to 0.6.0
+- fix compile with gcc 4.3
+
 * Mon Oct 22 2007 Douglas E. Warner <silfreed at silfreed.net> 0.5.3-4
 - including icon for desktop file
 - disabling parallel make flags


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkarte/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Oct 2007 11:17:06 -0000	1.2
+++ sources	9 Jan 2008 15:09:36 -0000	1.3
@@ -1 +1 @@
-ac787a7be7e1f0f6060f8ec6c31b78dc  QLandkarte.2007.09.18.tar.gz
+614cd25963e834fefcaea7137e2aa8d8  QLandkarte.2007.12.22.tar.gz