Fedora 26 now provides Qt 5.9, enable 3D in rpm spec for it

qgis · Nov 17, 2017 · 7cc7375 · 7cc7375
1 parent 1989111
commit 7cc7375
Showing 1 changed file with 1 addition and 17 deletions.
diff --git a/rpm/qgis.spec.template b/rpm/qgis.spec.template
@@ -12,18 +12,6 @@
 %define builddate %(date '+%a %b %d %Y')
 %endif
 
-# Qt53D support
-# Fedora 26 provides Qt 5.7 which is not supported at the moment.
-# This check may be removed when https://bodhi.fedoraproject.org/updates/FEDORA-2017-c133443edc
-# is pushed to stable
-%if 0%{?fedora} > 26
-%global configure_with_3d -D WITH_3D:BOOL=TRUE
-%global build_with_3d 1
-%else
-%global configure_with_3d -D WITH_3D:BOOL=FALSE
-%global build_with_3d 0
-%endif
-
 Name:           qgis
 Version:        %{_version}
 Release:        %{_relver}%{?dist}
@@ -103,9 +91,7 @@ BuildRequires: qt5-qtwebkit-devel
 BuildRequires: qt5-qtxmlpatterns-devel
 BuildRequires: qtkeychain-qt5-devel
 BuildRequires: qextserialport-devel
-%if 0%{?build_with_3d}
 BuildRequires: qt5-qt3d-devel
-%endif
 
 # Qwt stuff
 BuildRequires: qwt-devel
@@ -223,7 +209,7 @@ gzip ChangeLog
       -D ENABLE_TESTS:BOOL=FALSE \
       -D WITH_QSPATIALITE:BOOL=TRUE \
       -D WITH_SERVER:BOOL=TRUE \
-      %{configure_with_3d} \
+      -D WITH_3D:BOOL=TRUE \
       .
 
       # Using external QEXTSERIALPORT causes segfaults
@@ -331,9 +317,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_libdir}/lib%{name}_analysis.so.*
 %{_libdir}/lib%{name}_core.so.*
 %{_libdir}/lib%{name}_gui.so.*
-%if 0%{?build_with_3d}
 %{_libdir}/lib%{name}_3d.so.*
-%endif
 %{_libdir}/%{name}/
 %{_qt5_prefix}/plugins/sqldrivers/libqsqlspatialite.so
 %{_bindir}/%{name}