[qlandkartegt/f16] update to 1.2.4

Dan Horák sharkcz at fedoraproject.org
Sun Oct 23 09:16:37 UTC 2011


commit 2af61f10374af84058eb24e685015a846cf8084b
Author: Dan Horák <dan at danny.cz>
Date:   Sun Oct 23 11:16:26 2011 +0200

    update to 1.2.4

 .gitignore                   |    1 +
 qlandkartegt-1.2.4-glu.patch |   22 ++++++++++++++++++++++
 qlandkartegt.spec            |    8 +++++++-
 sources                      |    2 +-
 4 files changed, 31 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4bbd79a..9ba5823 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /qlandkartegt-1.2.1.tar.gz
 /qlandkartegt-1.2.2.tar.gz
 /qlandkartegt-1.2.3.tar.gz
+/qlandkartegt-1.2.4.tar.gz
diff --git a/qlandkartegt-1.2.4-glu.patch b/qlandkartegt-1.2.4-glu.patch
new file mode 100644
index 0000000..30b8d82
--- /dev/null
+++ b/qlandkartegt-1.2.4-glu.patch
@@ -0,0 +1,22 @@
+diff -up qlandkartegt-1.2.4/src/CMap3D.cpp.glu qlandkartegt-1.2.4/src/CMap3D.cpp
+--- qlandkartegt-1.2.4/src/CMap3D.cpp.glu	2011-10-23 10:50:57.000000000 +0200
++++ qlandkartegt-1.2.4/src/CMap3D.cpp	2011-10-23 10:51:10.000000000 +0200
+@@ -33,6 +33,7 @@
+ 
+ #include <QtGui>
+ #include <QtOpenGL>
++#include <GL/glu.h>
+ #include <math.h>
+ 
+ #ifndef GL_CLAMP_TO_EDGE
+diff -up qlandkartegt-1.2.4/src/CMap3DWidget.cpp.glu qlandkartegt-1.2.4/src/CMap3DWidget.cpp
+--- qlandkartegt-1.2.4/src/CMap3DWidget.cpp.glu	2011-10-23 10:51:01.000000000 +0200
++++ qlandkartegt-1.2.4/src/CMap3DWidget.cpp	2011-10-23 10:51:24.000000000 +0200
+@@ -32,6 +32,7 @@
+ 
+ #include <QtGui>
+ #include <QtOpenGL>
++#include <GL/glu.h>
+ #include <QPixmap>
+ #include <QPainter>
+ #include <QGLPixelBuffer>
diff --git a/qlandkartegt.spec b/qlandkartegt.spec
index 3fab7a3..8f66a2f 100644
--- a/qlandkartegt.spec
+++ b/qlandkartegt.spec
@@ -1,5 +1,5 @@
 Name: qlandkartegt
-Version: 1.2.3
+Version: 1.2.4
 Release: 1%{?dist}
 Summary: GPS device mapping tool
 
@@ -8,6 +8,8 @@ License: GPLv2+
 URL: http://www.qlandkarte.org/
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# <GL/glu.h> not included by qt >= 4.8
+Patch0: %{name}-1.2.4-glu.patch
 Requires: garmindev(interface) = 1.18
 Requires: gpsbabel
 
@@ -45,6 +47,7 @@ GDAL tools, but it will simplify their use to the demands of most users.
 
 %prep
 %setup -q
+%patch0 -p1 -b .glu
 
 # create build direcotory
 mkdir build
@@ -80,6 +83,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Oct 23 2011 Dan Horák <dan[at]danny.cz> 1.2.4-1
+- update to 1.2.4
+
 * Wed Aug 31 2011 Dan Horák <dan[at]danny.cz> 1.2.3-1
 - update to 1.2.3
 
diff --git a/sources b/sources
index 3449db4..f923a22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec1b7022ac81385be4979ea01f4e8309  qlandkartegt-1.2.3.tar.gz
+ddac72ca5b72dbb185ad9fddd93df6ff  qlandkartegt-1.2.4.tar.gz


More information about the scm-commits mailing list