[qwtplot3d] 0.2.7-12

[Rex Dieter]

commit 81d4cb521e2dd46f6b57cbe73909115f991dac5a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jun 27 13:15:43 2012 -0500

    0.2.7-12
    
    - Building against qwtplot3d-qt4 fails (#805684)
    - tighten subpkg deps

 qwtplot3d-glu.patch |   23 +++++++++++++++++++++++
 qwtplot3d.spec      |   16 +++++++++++++---
 2 files changed, 36 insertions(+), 3 deletions(-)
---
diff --git a/qwtplot3d-glu.patch b/qwtplot3d-glu.patch
new file mode 100644
index 0000000..a9f1b6e
--- /dev/null
+++ b/qwtplot3d-glu.patch
@@ -0,0 +1,23 @@
+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>
++//#include <QtOpenGL/qgl.h>
+ #endif
+ 
+ #include "qwt3d_types.h"
+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 949a306..a2557ef 100644
--- a/qwtplot3d.spec
+++ b/qwtplot3d.spec
@@ -3,7 +3,7 @@
 
 Name:           qwtplot3d
 Version:        0.2.7
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Qt/OpenGL-based C++ library providing a bunch of 3D-widgets
 
 Group:          System Environment/Libraries
@@ -14,6 +14,9 @@ Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tgz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstreamable patches
+Patch50:  qwtplot3d-glu.patch
+
 BuildRequires:  qt3-devel
 BuildRequires:  libXmu-devel
 
@@ -26,7 +29,7 @@ programmers.
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       qt3-devel
 
 %description    devel
@@ -48,7 +51,7 @@ programmers.
 %package        qt4-devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name}-qt4 = %{version}-%{release}
+Requires:       %{name}-qt4%{?_isa} = %{version}-%{release}
 Requires:       qt4-devel
 
 %description    qt4-devel
@@ -60,6 +63,8 @@ developing applications that use %{name}.
 %prep
 %setup -q -n %{name}
 
+%patch50 -p1 -b .glu
+
 #fix line endings
 %{__sed} -i 's/\r//' COPYING
 find examples -type f | xargs %{__sed} -i 's/\r//'
@@ -160,6 +165,11 @@ 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-12
+- Building against qwtplot3d-qt4 fails (#805684)
+- tighten subpkg deps
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.7-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild