[qwt/f19] QtDesigner plugin doesn't link to the proper header directory path (#824447)

[Rex Dieter]

commit 2027664cc2d0395dc8d6ee6d4e07d0601748ee97
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Oct 29 14:00:58 2013 -0500

    QtDesigner plugin doesn't link to the proper header directory path (#824447)

 qwt-6.0.1-install_qt.patch |   47 ++++++++++++++++++++++++++++++-------------
 qwt.spec                   |    5 +++-
 2 files changed, 37 insertions(+), 15 deletions(-)
---
diff --git a/qwt-6.0.1-install_qt.patch b/qwt-6.0.1-install_qt.patch
index c5e06e7..4df65b6 100644
--- a/qwt-6.0.1-install_qt.patch
+++ b/qwt-6.0.1-install_qt.patch
@@ -1,6 +1,6 @@
 diff -up qwt-6.0.1/qwtbuild.pri.install-qt qwt-6.0.1/qwtbuild.pri
 --- qwt-6.0.1/qwtbuild.pri.install-qt	2011-08-01 09:33:53.000000000 -0500
-+++ qwt-6.0.1/qwtbuild.pri	2012-11-26 16:32:07.290520771 -0600
++++ qwt-6.0.1/qwtbuild.pri	2013-10-29 13:54:35.479463030 -0500
 @@ -14,7 +14,6 @@
  CONFIG           += qt     
  CONFIG           += warn_on
@@ -20,32 +20,51 @@ diff -up qwt-6.0.1/qwtbuild.pri.install-qt qwt-6.0.1/qwtbuild.pri
          # in the same directory as the Qt libraries. Unfortunately
 diff -up qwt-6.0.1/qwtconfig.pri.install-qt qwt-6.0.1/qwtconfig.pri
 --- qwt-6.0.1/qwtconfig.pri.install-qt	2011-08-01 09:33:53.000000000 -0500
-+++ qwt-6.0.1/qwtconfig.pri	2012-11-26 16:29:01.360797707 -0600
-@@ -18,6 +18,13 @@ QWT_VERSION      = $${QWT_VER_MAJ}.$${QW
++++ qwt-6.0.1/qwtconfig.pri	2013-10-29 13:56:29.967338065 -0500
+@@ -18,24 +18,16 @@ QWT_VERSION      = $${QWT_VER_MAJ}.$${QW
  
  QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
  
-+CONFIG(install-qt) {
+-unix {
+-    QWT_INSTALL_PREFIX    = /usr/local/qwt-$$QWT_VERSION
+-}
+-
+-win32 {
+-    QWT_INSTALL_PREFIX    = C:/Qwt-$$QWT_VERSION
+-}
+-
+-QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/doc
+-QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include
+-QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib
 +QWT_INSTALL_DOCS      = $$[QT_INSTALL_DOCS]/html
 +QWT_INSTALL_HEADERS   = $$[QT_INSTALL_HEADERS]/qwt
 +QWT_INSTALL_LIBS      = $$[QT_INSTALL_LIBS]
+ 
+ ######################################################################
+ # Designer plugin
+ ######################################################################
+ 
+-QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_PREFIX}/plugins/designer
+-# QWT_INSTALL_PLUGINS   = $${QT_INSTALL_PREFIX}/plugins/designer
++#QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_PREFIX}/plugins/designer
 +QWT_INSTALL_PLUGINS   = $$[QT_INSTALL_PLUGINS]/designer 
-+QWT_INSTALL_FEATURES  = $$[QMAKE_MKSPECS]/features 
-+} else {
- unix {
-     QWT_INSTALL_PREFIX    = /usr/local/qwt-$$QWT_VERSION
- }
-@@ -51,6 +58,7 @@ QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_P
  
- QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
- # QWT_INSTALL_FEATURES  = $${QT_INSTALL_PREFIX}/features
-+}
+ ######################################################################
+ # Features
+@@ -49,8 +41,8 @@ QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_P
+ # with every Qt upgrade. 
+ ######################################################################
+ 
+-QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
+-# QWT_INSTALL_FEATURES  = $${QT_INSTALL_PREFIX}/features
++#QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
++QWT_INSTALL_FEATURES  = $$[QMAKE_MKSPECS]/features
  
  ######################################################################
  # Build the static/shared libraries.
 diff -up qwt-6.0.1/src/src.pro.install-qt qwt-6.0.1/src/src.pro
 --- qwt-6.0.1/src/src.pro.install-qt	2011-08-01 09:33:53.000000000 -0500
-+++ qwt-6.0.1/src/src.pro	2012-11-26 16:29:01.361797695 -0600
++++ qwt-6.0.1/src/src.pro	2013-10-29 13:54:35.491462807 -0500
 @@ -16,6 +16,15 @@ include( $${QWT_ROOT}/qwtbuild.pri )
  TEMPLATE          = lib
  TARGET            = $$qtLibraryTarget(qwt)
diff --git a/qwt.spec b/qwt.spec
index 7d03245..78392e8 100644
--- a/qwt.spec
+++ b/qwt.spec
@@ -2,7 +2,7 @@
 Name:    qwt
 Summary: Qt Widgets for Technical Applications
 Version: 6.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: LGPLv2 with exceptions
 URL:     http://qwt.sourceforge.net
@@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 29 2013 Rex Dieter <rdieter at fedoraproject.org> 6.0.1-5
+- QtDesigner plugin doesn't link to the proper header directory path (#824447)
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild