[qwtplot3d] Revert "better GL/GLU related fix (from upstream)"

[Rex Dieter]

commit 6d7c05adc2882bcd6fe28c7d580b1c9c2d04fcea
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jun 27 13:51:24 2012 -0500

    Revert "better GL/GLU related fix (from upstream)"
    
    This reverts commit 6445553f890115b989421e548d6ca2830e2cdeaa.
    
    ah, this breaks qt3 build, keep previous minimalist fix afterall

 qwtplot3d-glu.patch |   42 ++++++++++++++++--------------------------
 qwtplot3d.spec      |    5 +----
 2 files changed, 17 insertions(+), 30 deletions(-)
---
diff --git a/qwtplot3d-glu.patch b/qwtplot3d-glu.patch
index 0a9b882..a9f1b6e 100644
--- a/qwtplot3d-glu.patch
+++ b/qwtplot3d-glu.patch
@@ -1,32 +1,22 @@
-diff -up qwtplot3d/include/qwt3d_io_gl2ps.h.glu qwtplot3d/include/qwt3d_io_gl2ps.h
---- qwtplot3d/include/qwt3d_io_gl2ps.h.glu	2005-07-10 09:54:52.000000000 -0500
-+++ qwtplot3d/include/qwt3d_io_gl2ps.h	2012-06-27 13:42:58.947621825 -0500
-@@ -3,11 +3,7 @@
- 
- #include <time.h>
- 
--#if QT_VERSION < 0x040000
--#include <qgl.h>
--#else
+diff -up qwtplot3d/include/qwt3d_io_gl2ps.h.qt48 qwtplot3d/include/qwt3d_io_gl2ps.h
+--- qwtplot3d/include/qwt3d_io_gl2ps.h.qt48	2005-07-10 09:54:52.000000000 -0500
++++ qwtplot3d/include/qwt3d_io_gl2ps.h	2012-06-27 13:10:09.056248812 -0500
+@@ -6,7 +6,7 @@
+ #if QT_VERSION < 0x040000
+ #include <qgl.h>
+ #else
 -#include <QtOpenGL/qgl.h>
--#endif
-+#include <QtOpenGL>
++//#include <QtOpenGL/qgl.h>
+ #endif
  
  #include "qwt3d_types.h"
- #include "qwt3d_io.h"
-diff -up qwtplot3d/include/qwt3d_openglhelper.h.glu qwtplot3d/include/qwt3d_openglhelper.h
---- qwtplot3d/include/qwt3d_openglhelper.h.glu	2005-07-19 10:40:28.000000000 -0500
-+++ qwtplot3d/include/qwt3d_openglhelper.h	2012-06-27 13:40:28.492502750 -0500
-@@ -2,11 +2,8 @@
- #define __openglhelper_2003_06_06_15_49__
- 
- #include "qglobal.h"
--#if QT_VERSION < 0x040000
--#include <qgl.h>
--#else
--#include <QtOpenGL/qgl.h>
--#endif
-+#include <QtOpenGL>
+diff -up qwtplot3d/include/qwt3d_openglhelper.h.qt48 qwtplot3d/include/qwt3d_openglhelper.h
+--- qwtplot3d/include/qwt3d_openglhelper.h.qt48	2005-07-19 10:40:28.000000000 -0500
++++ qwtplot3d/include/qwt3d_openglhelper.h	2012-06-27 13:11:47.914012939 -0500
+@@ -7,6 +7,7 @@
+ #else
+ #include <QtOpenGL/qgl.h>
+ #endif
 +#include <GL/glu.h>
  
  namespace Qwt3D
diff --git a/qwtplot3d.spec b/qwtplot3d.spec
index ab0cacd..a2557ef 100644
--- a/qwtplot3d.spec
+++ b/qwtplot3d.spec
@@ -3,7 +3,7 @@
 
 Name:           qwtplot3d
 Version:        0.2.7
-Release:        13%{?dist}
+Release:        12%{?dist}
 Summary:        Qt/OpenGL-based C++ library providing a bunch of 3D-widgets
 
 Group:          System Environment/Libraries
@@ -165,9 +165,6 @@ ln -s libqwtplot3d-qt4.so.%{version} %{buildroot}%{_qt4_libdir}/libqwtplot3d-qt4
 
 
 %changelog
-* Wed Jun 27 2012 Rex Dieter <rdieter at fedoraproject.org> 0.2.7-13
-- better GL/GLU related fix (from upstream)
-
 * Wed Jun 27 2012 Rex Dieter <rdieter at fedoraproject.org> 
 - 0.2.7-12
 - Building against qwtplot3d-qt4 fails (#805684)