[qt-creator/el6: 5/5] Enabling building on RHEL 6 and building against Qt 5

[Dave Johansen]

commit 3cfa10a8ce8dd0cdd974376637a2389c7bade6af
Author: Dave Johansen <davejohansen at gmail.com>
Date:   Mon Feb 17 21:23:24 2014 -0700

    Enabling building on RHEL 6 and building against Qt 5

 qt-creator.spec |   58 +++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 40 insertions(+), 18 deletions(-)
---
diff --git a/qt-creator.spec b/qt-creator.spec
index 86f50b5..4a81413 100644
--- a/qt-creator.spec
+++ b/qt-creator.spec
@@ -1,8 +1,14 @@
 #global pre rc1
 
+# If building on Fedora or RHEL 7
+%if 0%{?rhel}%{?fedora} >= 7
+  # Then use the system botan (needs to be 1.10)
+  %bcond_without botan
+%endif
+
 Name:           qt-creator
 Version:        3.0.1
-Release:        1%{?pre:.%pre}%{?dist}
+Release:        2%{?pre:.%pre}%{?dist}
 Summary:        Cross-platform IDE for Qt
 
 Group:          Development/Tools
@@ -13,23 +19,28 @@ Source0:        http://download.qt-project.org/official_releases/qtcreator/3.0/%
 Source1:        qtcreator.desktop
 Source2:        qt-creator-Fedora-privlibs
 
+Patch0:         qt-creator-rhel6-werror.patch
+
 Requires:       hicolor-icon-theme
 Requires:       xdg-utils
+Requires:       qt5-qtquickcontrols
+Requires:       qt5-qtdoc
 
-#required for demos/examples
-Requires:       qt-demos
-Requires:       qt-examples
 # we need qt-devel and gcc-c++ to compile programs using qt-creator
-Requires:       qt4-devel
+Requires:       qt5-qtbase-devel
 Requires:       gcc-c++
-%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 
-BuildRequires:  qt4-devel >= 4.7.2
-BuildRequires:  qt4-webkit-devel
-# for QmlDesigner, see also https://bugzilla.redhat.com/show_bug.cgi?id=657498
-BuildRequires:  qt4-devel-private
+
+BuildRequires:  qt5-qtbase-devel
+BuildRequires:  qt5-qtscript-devel
+BuildRequires:  qt5-qttools-devel
+BuildRequires:  qt5-qtwebkit-devel
+BuildRequires:  qt5-qtxmlpatterns-devel
+BuildRequires:  qt5-qtx11extras-devel
 BuildRequires:  desktop-file-utils
+%if %{with botan}
 BuildRequires:  botan-devel
+%endif
 BuildRequires:  diffutils
 
 # long list of private shared lib names to filter out
@@ -43,15 +54,23 @@ tailored to the needs of Qt developers.
 
 %prep
 %setup -q -n qt-creator-opensource-src-%{version}%{?pre:-%pre}
+# If -Werror needs to be disabled (see https://bugzilla.redhat.com/show_bug.cgi?id=1013751)
+%if 0%{?rhel}%{?fedora} == 6
+%patch0
+%endif
 
 %build
-QTDIR="%{_qt4_prefix}" ; export QTDIR ; \
-PATH="%{_qt4_bindir}:$PATH" ; export PATH ; \
-CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
-
-qmake-qt4 -r IDE_LIBRARY_BASENAME=%{_lib} USE_SYSTEM_BOTAN=1
+export QTDIR="%{_qt5_prefix}"
+export PATH="%{_qt5_bindir}:$PATH"
+export CFLAGS="${CFLAGS:-%optflags}"
+export CXXFLAGS="${CXXFLAGS:-%optflags}"
+export FFLAGS="${FFLAGS:-%optflags}"
+
+qmake-qt5 -r \
+%if %{with botan}
+  USE_SYSTEM_BOTAN=1 \
+%endif
+  IDE_LIBRARY_BASENAME=%{_lib}
 make %{?_smp_mflags}
 
 %install
@@ -95,7 +114,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %doc README LICENSE.LGPL LGPL_EXCEPTION.TXT
-%{_bindir}/qmlpuppet
+%{_bindir}/qml2puppet
 %{_bindir}/qtpromaker
 %{_bindir}/qtcreator
 %{_bindir}/qtcreator_process_stub
@@ -108,6 +127,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #%%{_datadir}/doc/qtcreator/qtcreator.qch
 
 %changelog
+* Mon Feb 17 2014 Dave Johansen <davejohansen at gmail.com> - 3.0.1-2
+- Enabling building on RHEL 6 and building against Qt 5
+
 * Thu Feb 06 2014 Sandro Mani <manisandro at gmail.com> - 3.0.1-1
 - 3.0.1 stable release
 - Fix homepage URL