qt5 is available for el6 from epel

diff --git a/configure.ac b/configure.ac
index f5cc2461ced6263525dcf0fd77d8995ce2e07aa9..9a91554c2b0074f1f07f51cf5257c660cea10a6e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2338,7 +2338,7 @@ else
      ],[
        CXXFLAGS="${CXXFLAGS} -fPIE -fPIC"
      ])
-  AC_CHECK_PROGS(QMAKE,qmake-qt5 qmake,false)
+  AC_CHECK_PROGS(QMAKE,qmake-qt5 qmake-qt4 qmake,false)
   if test "$QMAKE" != "false"; then
     PKG_CHECK_MODULES(QTCORE, [Qt5Core],[
       PKG_CHECK_MODULES(QTGUI, [Qt5Widgets Qt5PrintSupport],[

diff --git a/redhat/graphviz.spec.fedora.in b/redhat/graphviz.spec.fedora.in
index a75d91c7469368c34bcc09e28238072ead8755ee..f8eb20b75701775d877bb58bd2530006a90f9e28 100644 (file)
--- a/redhat/graphviz.spec.fedora.in
+++ b/redhat/graphviz.spec.fedora.in
@@ -31,7 +31,6 @@ Source0: http://www.graphviz.org/pub/@GRAPHVIZ_SOURCES@/graphviz-@VERSION@.tar.g
 %global PYTHON   0
 %global PYTHON2  1
 %global PYTHON3  1
-%global QT4      0
 %global QT5      1
 # Not yet.
 %global MING     0
@@ -51,8 +50,6 @@ Source0: http://www.graphviz.org/pub/@GRAPHVIZ_SOURCES@/graphviz-@VERSION@.tar.g
 %global PYTHON   1
 %global PYTHON2  0
 %global PYTHON3  0
-%global QT4      1
-%global QT5      0
 %endif
 
 # Plugins version
@@ -108,11 +105,8 @@ BuildRequires: golang gcc-go swig >= 3.0.2
 %if %{GTK}
 BuildRequires: libglade2-devel gtkglarea2-devel gtkglext-devel glade3-libgladeui-devel
 %endif
-%if %{QT4}
-BuildRequires: qt-devel
-%endif
 %if %{QT5}
-BuildRequires: qt5-devel
+BuildRequires: qt5-qtbase-devel
 %endif
 
 # What a meal PHP makes of versioning !!!
@@ -132,7 +126,7 @@ BuildRequires: qt5-devel
 # RPM 4.9
 %global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{php_extdir}/.*\\.so$
 
-# Fix for the 387 extended precision (rhbz#772637)
+# Fix for the i386 extended precision (rhbz#772637)
 %ifarch i386 i686
 %global FFSTORE -ffloat-store
 %endif