[gammaray/f19: 5/6] GammaRay 2.0.0

[Daniel Vrátil]

commit 56496b22f552d3a4eb42a50f8251bef31248b09a
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Wed Jan 22 18:05:47 2014 +0100

    GammaRay 2.0.0

 .gitignore    |    1 +
 gammaray.spec |   36 ++++++++++++++++++++++++------------
 sources       |    2 +-
 3 files changed, 26 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 379b2e9..b6bee5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /gammaray-1.3.1.tar.gz
 /qt-everywhere-opensource-src-4.8.5.tar.gz
 /gammaray-1.3.2.tar.gz
+/gammaray-2.0.0.tar.gz
diff --git a/gammaray.spec b/gammaray.spec
index 23591b1..5a87b5e 100644
--- a/gammaray.spec
+++ b/gammaray.spec
@@ -1,8 +1,8 @@
 %global qt_version 4.8.5
 
 Name:           gammaray
-Version:        1.3.2
-Release:        2%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        A tool for examining internals of Qt applications
 
 License:        GPLv2+
@@ -12,8 +12,8 @@ URL:            http://www.kdab.com/kdab-products/gammaray/
 Source0:        gammaray-%{version}.tar.gz
 Source1:        http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-%{qt_version}.tar.gz
 
-BuildRequires:  qt-devel
-BuildRequires:  qt-devel-private
+BuildRequires:  qt-devel%{?_isa} = 1:%qt_version
+BuildRequires:  qt-devel-private = 1:%qt_version
 BuildRequires:  qtwebkit-devel
 BuildRequires:  vtk-devel
 BuildRequires:  glibc-devel
@@ -31,6 +31,8 @@ BuildRequires:  blas-devel
 BuildRequires:  lapack-devel
 BuildRequires:  netcdf-devel
 
+Requires:       qt%{?_isa} = 1:%qt_version
+
 %description
 A tool to poke around in a Qt-application and also to manipulate
 the application to some extent. It uses various DLL injection
@@ -56,23 +58,26 @@ This package includes developer documentation in HTML format.
 %setup -q -b 1 -n GammaRay-%{version}
 
 %build
-%cmake . -DQT_PRIVATE_INCLUDE_DIR=%{_builddir}/qt-everywhere-opensource-src-%{qt_version}/include/QtCore
-make %{?_smp_mflags}
-make docs
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%cmake .. \
+        -DQT_PRIVATE_INCLUDE_DIR=%{_builddir}/qt-everywhere-opensource-src-%{qt_version}/include/QtCore \
+        -DGAMMARAY_ENFORCE_QT4_BUILD:BOOL=ON \
+        -DVTK_DIR=%{_libdir}/cmake/vtk
+popd
+make %{?_smp_mflags} -C %{_target_platform}
+make docs -C %{_target_platform}
 
 %install
-%make_install
+%make_install -C %{_target_platform}
 
 # Install apidoc
 mkdir -p %{buildroot}/%{_docdir}/gammaray/html
-cp -r %{_builddir}/GammaRay-%{version}/apidocs/html/* %{buildroot}/%{_docdir}/gammaray/html/
+cp -r %{_builddir}/GammaRay-%{version}/%{_target_platform}/apidocs/html/* %{buildroot}/%{_docdir}/gammaray/html/
 
 # Copy ReadMe.txt and License.txt so that we can install it with doc subpkg
 cp %{_builddir}/GammaRay-%{version}/{License.txt,ReadMe.txt} %{buildroot}/%{_docdir}/gammaray/
 
-# Force remove rpath from a plugin
-chrpath --delete %{buildroot}/%{_qt4_plugindir}/gammaray/gammaray_kjobtracker_plugin.so
-
 %files
 %{_bindir}/gammaray
 %{_qt4_libdir}/*.so
@@ -91,6 +96,13 @@ chrpath --delete %{buildroot}/%{_qt4_plugindir}/gammaray/gammaray_kjobtracker_pl
 %{_docdir}/gammaray/html/
 
 %changelog
+* Wed Jan 22 2014 Daniel Vrátil <dvratil at redhat.com> - 2.0.0-1
+- GammaRay 2.0.0
+- require specific version of Qt
+- point CMake to VTK dir
+- enforce Qt 4 build (GammaRay automatically switches to Qt 5 build when it finds it installed)
+- remove rpath workaround
+
 * Thu Jan 02 2014 Daniel Vrátil <dvratil at redhat.com> - 1.3.2-2
 - Rebuilt against new VTK
 - BR blas-devel
diff --git a/sources b/sources
index db9cc88..ec8f9a6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+28eebc11503e892c145967ac99251ac1  gammaray-2.0.0.tar.gz
 1864987bdbb2f58f8ae8b350dfdbe133  qt-everywhere-opensource-src-4.8.5.tar.gz
-0054f7c55506a866f03f07aea808139b  gammaray-1.3.2.tar.gz