[gle] - 64-bit fixes

[Dan Horák]

commit bd4e837af33447ceba62cf87add181cc057b3611
Author: Dan Horák <dan at danny.cz>
Date:   Fri Oct 1 15:22:44 2010 +0200

    - 64-bit fixes

 gle-4.2.2-64bit.patch |   34 ++++++++++++++++++++++++++++++++++
 gle.spec              |    7 ++++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/gle-4.2.2-64bit.patch b/gle-4.2.2-64bit.patch
new file mode 100644
index 0000000..b448ada
--- /dev/null
+++ b/gle-4.2.2-64bit.patch
@@ -0,0 +1,34 @@
+diff -up gle-graphics-4.2.2/src/gui/qgle.pro.in.64bit gle-graphics-4.2.2/src/gui/qgle.pro.in
+--- gle-graphics-4.2.2/src/gui/qgle.pro.in.64bit	2010-10-01 15:06:36.000000000 +0200
++++ gle-graphics-4.2.2/src/gui/qgle.pro.in	2010-10-01 15:06:45.000000000 +0200
+@@ -160,6 +160,9 @@ DISTFILES += readme.txt \
+ linux-g++ {
+ 	LIBS += -ldl
+ }
++linux-g++-64 {
++	LIBS += -ldl
++}
+ 
+ # link against the GLE library (unix -> Linux and Mac OS/X)
+ unix {
+diff -up gle-graphics-4.2.2/src/gui/qgslibloader.cpp.64bit gle-graphics-4.2.2/src/gui/qgslibloader.cpp
+--- gle-graphics-4.2.2/src/gui/qgslibloader.cpp.64bit	2010-10-01 15:07:27.000000000 +0200
++++ gle-graphics-4.2.2/src/gui/qgslibloader.cpp	2010-10-01 15:11:09.000000000 +0200
+@@ -246,7 +246,7 @@ int GSLibFunctions::loadLibrary(const QS
+ 	/* Try to load the library */
+ 	if (location == "") {
+ 		#ifdef Q_WS_X11
+-		#ifdef __x86_64__
++		#if defined(__x86_64__) || defined(__ppc64__) || defined (__s390x__) || defined (__sparc64__)
+ 		// try 64 bit libraries on 64 bit system
+ 		tryLocation("/usr/lib64/libgs.so");
+ 		tryLocation("/usr/lib64/libgs.so.8");
+@@ -257,7 +257,7 @@ int GSLibFunctions::loadLibrary(const QS
+ 		tryLocation("/usr/lib/libgs.so.8");
+ 		tryLocation("/usr/local/lib/libgs.so");
+ 		tryLocation("/usr/local/lib/libgs.so.8");
+-		#endif  // __x86_64__
++		#endif  // 64-bit
+ 		#endif
+ 		#ifdef Q_WS_MAC
+ 		tryLocation("/usr/lib/libgs.dylib");
diff --git a/gle.spec b/gle.spec
index 2cb7d09..0fb30e5 100644
--- a/gle.spec
+++ b/gle.spec
@@ -4,13 +4,14 @@
 Summary:       Graphics Layout Engine
 Name:          gle
 Version:       4.2.2
-Release:       5%{?dist}
+Release:       6%{?dist}
 License:       GPLv2+
 Group:         Applications/Multimedia
 URL:           http://www.gle-graphics.org/
 Source0:       http://downloads.sourceforge.net/glx/gle-graphics-%{version}-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
 BuildRequires: libstdc++-devel >= 3.0
 BuildRequires: libpng-devel libtiff-devel libjpeg-devel 
 BuildRequires: ncurses-devel zlib-devel xorg-x11-proto-devel
@@ -31,6 +32,7 @@ JPEG, and PNG.
 
 %prep
 %setup -q -n %{oname}-%{version}
+%patch0 -p1 -b .64bit
 %{__install} -p -m 0644 %{SOURCE1} .
 %{__install} -p -m 0644 %{SOURCE2} .
 
@@ -64,6 +66,9 @@ dos2unix LICENSE.txt
 %{_libdir}/lib%{oname}-%{version}.so
 
 %changelog
+* Fri Oct  1 2010 Dan Horák <dan[at]danny.cz> - 4.2.2-6
+- 64-bit fixes
+
 * Wed Sep  7 2010 Terje Rosten <terje.rosten at ntnu.no> - 4.2.2-3
 * Be more explicit about qt devel buildreq