Skip to content

Commit 7cc7375

Browse files
danivigam-kuhn
authored andcommitted
Fedora 26 now provides Qt 5.9, enable 3D in rpm spec for it
1 parent 1989111 commit 7cc7375

File tree

1 file changed

+1
-17
lines changed

1 file changed

+1
-17
lines changed

rpm/qgis.spec.template

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,6 @@
1212
%define builddate %(date '+%a %b %d %Y')
1313
%endif
1414

15-
# Qt53D support
16-
# Fedora 26 provides Qt 5.7 which is not supported at the moment.
17-
# This check may be removed when https://bodhi.fedoraproject.org/updates/FEDORA-2017-c133443edc
18-
# is pushed to stable
19-
%if 0%{?fedora} > 26
20-
%global configure_with_3d -D WITH_3D:BOOL=TRUE
21-
%global build_with_3d 1
22-
%else
23-
%global configure_with_3d -D WITH_3D:BOOL=FALSE
24-
%global build_with_3d 0
25-
%endif
26-
2715
Name: qgis
2816
Version: %{_version}
2917
Release: %{_relver}%{?dist}
@@ -103,9 +91,7 @@ BuildRequires: qt5-qtwebkit-devel
10391
BuildRequires: qt5-qtxmlpatterns-devel
10492
BuildRequires: qtkeychain-qt5-devel
10593
BuildRequires: qextserialport-devel
106-
%if 0%{?build_with_3d}
10794
BuildRequires: qt5-qt3d-devel
108-
%endif
10995

11096
# Qwt stuff
11197
BuildRequires: qwt-devel
@@ -223,7 +209,7 @@ gzip ChangeLog
223209
-D ENABLE_TESTS:BOOL=FALSE \
224210
-D WITH_QSPATIALITE:BOOL=TRUE \
225211
-D WITH_SERVER:BOOL=TRUE \
226-
%{configure_with_3d} \
212+
-D WITH_3D:BOOL=TRUE \
227213
.
228214

229215
# Using external QEXTSERIALPORT causes segfaults
@@ -331,9 +317,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
331317
%{_libdir}/lib%{name}_analysis.so.*
332318
%{_libdir}/lib%{name}_core.so.*
333319
%{_libdir}/lib%{name}_gui.so.*
334-
%if 0%{?build_with_3d}
335320
%{_libdir}/lib%{name}_3d.so.*
336-
%endif
337321
%{_libdir}/%{name}/
338322
%{_qt5_prefix}/plugins/sqldrivers/libqsqlspatialite.so
339323
%{_bindir}/%{name}

0 commit comments

Comments
 (0)