[libQGLViewer/f17] Honor %{_pkgdocdir} where available.

[Laurent Rineau]

commit 4207612471ca6b8bb7454f09d9d8730b37025057
Author: Laurent Rineau <laurent.rineau at cgal.org>
Date:   Tue Aug 6 15:24:07 2013 +0200

    Honor %{_pkgdocdir} where available.
    
      See https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
    
    + No longer use the macro %{_qt4_qmake} and %{_qt4_plugindir}.

 libQGLViewer.spec |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/libQGLViewer.spec b/libQGLViewer.spec
index 23b17f2..207ceb3 100644
--- a/libQGLViewer.spec
+++ b/libQGLViewer.spec
@@ -1,6 +1,6 @@
 Name:           libQGLViewer
 Version:        2.3.9
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Qt based OpenGL generic 3D viewer library
 
 Group:          System Environment/Libraries
@@ -77,10 +77,13 @@ do
 done
 
 %build
+
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 cd QGLViewer
-%{_qt4_qmake} \
+qmake-qt4 \
           LIB_DIR=%{_libdir} \
-          DOC_DIR=%{_defaultdocdir}/%{name}-%{version} \
+          DOC_DIR=%{_pkgdocdir} \
           INCLUDE_DIR=%{_includedir} \
           TARGET_x=%{name}.so.%{version}
 # The TARGET_x variable gives the SONAME. However, qmake behavior is not
@@ -90,7 +93,7 @@ cd QGLViewer
 make %{?_smp_mflags}
 
 cd ../designerPlugin
-%{_qt4_qmake} LIB_DIR=../QGLViewer
+qmake-qt4 LIB_DIR=../QGLViewer
 make %{?_smp_mflags}
 
 %install
@@ -125,7 +128,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_includedir}/QGLViewer/
 %{_libdir}/libQGLViewer.so
-%{_qt4_plugindir}/designer/libqglviewerplugin.so
+%{_libdir}/qt4/plugins/designer/libqglviewerplugin.so
 
 %files doc
 %defattr(-,root,root,-)
@@ -133,6 +136,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc examples
 
 %changelog
+* Tue Aug  6 2013 Laurent Rineau <lrineau at renoir.geometryfactory.com> - 2.3.9-4
+- Honor %%{_pkgdocdir} where available.
+  See https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
+- No longer use the macro %%{_qt4_qmake} and %%{_qt4_plugindir}.
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.9-4
 - Rebuilt for c++ ABI breakage