[gle] 4.2.4 Update patches
terjeros
terjeros at fedoraproject.org
Mon Jan 2 13:19:28 UTC 2012
commit 67062a002bdbffb6171d466128b1cd9b397b1e7c
Author: Terje Røsten <terje.rosten at ntnu.no>
Date: Mon Jan 2 14:19:23 2012 +0100
4.2.4
Update patches
gle-4.2.3b-include.patch | 24 ------------------------
gle-4.2.4-include.patch | 26 ++++++++++++++++++++++++++
gle.spec | 14 ++++++++------
3 files changed, 34 insertions(+), 30 deletions(-)
---
diff --git a/gle-4.2.4-include.patch b/gle-4.2.4-include.patch
new file mode 100644
index 0000000..fe48cf7
--- /dev/null
+++ b/gle-4.2.4-include.patch
@@ -0,0 +1,26 @@
+diff --git a/src/gui/3dviewer.cpp b/src/gui/3dviewer.cpp
+index a13fead..3cd238d 100644
+--- a/src/gui/3dviewer.cpp
++++ b/src/gui/3dviewer.cpp
+@@ -21,6 +21,7 @@
+
+ #include <QtGui>
+ #include <QtOpenGL>
++#include <GL/glu.h>
+ #include "3dviewer.h"
+ #include "../gle/cutils.h"
+ #include "../gle/gle-block.h"
+diff --git a/src/gui/qgle.pro.in b/src/gui/qgle.pro.in
+index cf3617f..81c5acb 100644
+--- a/src/gui/qgle.pro.in
++++ b/src/gui/qgle.pro.in
+@@ -171,6 +171,9 @@ win32 {
+ LIBS += -lgle-graphics- at GLE_VERSION@ -L../../build/bin/
+ }
+
++# Link against GLU library
++LIBS += -lGLU
++
+ # place the resulting QGLE executable in the "bin" subdirectory of "build"
+ DESTDIR = ../../build/bin
+
diff --git a/gle.spec b/gle.spec
index 8992066..79754ff 100644
--- a/gle.spec
+++ b/gle.spec
@@ -3,17 +3,16 @@
Summary: Graphics Layout Engine
Name: gle
-Version: 4.2.3b
-Release: 4%{?dist}
+Version: 4.2.4
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.gle-graphics.org/
Source0: http://downloads.sourceforge.net/glx/gle-graphics-%{version}f-src.tar.gz
Source1: http://downloads.sourceforge.net/glx/gle-manual-%{mver}.pdf
Source2: http://downloads.sourceforge.net/glx/GLEusersguide.pdf
-Patch0: %{name}-4.2.2-64bit.patch
# Add missing GLU include and library
-Patch1: %{name}-4.2.3b-include.patch
+Patch0: gle-4.2.4-include.patch
# Due to branching of docs and qgle
Obsoletes: %{name} < 4.2.2-8
@@ -82,8 +81,7 @@ This package contains the user documentation.
%prep
%setup -q -n %{oname}-%{version}
-%patch0 -p1 -b .64bit
-%patch1 -p1 -b .inc
+%patch0 -p1 -b .inc
install -p -m 0644 %{SOURCE1} .
install -p -m 0644 %{SOURCE2} .
@@ -125,6 +123,10 @@ rm -rf %{buildroot}
%doc LICENSE.txt gle-manual-%{mver}.pdf GLEusersguide.pdf
%changelog
+* Mon Jan 02 2012 Terje Rosten <terje.rosten at ntnu.no> - 4.2.4-1
+- 4.2.4
+- Update patches
+
* Mon Nov 07 2011 Terje Rosten <terje.rosten at ntnu.no> - 4.2.3b-4
- Rebuilt for new libpng
More information about the scm-commits
mailing list