Permalink
Browse files
Merge pull request #5471 from daniviga/rpm-3d
libqgis_3d.so missing in rpm spec
- Loading branch information
Showing
with
12 additions
and
3 deletions.
-
+1
−1
doc/INSTALL.html
-
+1
−1
doc/linux.t2t
-
+10
−1
rpm/qgis.spec.template
|
|
@@ -596,7 +596,7 @@ <H2>3.9. On Fedora Linux</H2> |
|
|
<H3>3.9.1. Install build dependencies</H3> |
|
|
|
|
|
<div class="code"><PRE> |
|
|
dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static qt5-qtscript-devel qca-qt5-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-devel python3-qscintilla-qt5 clang flex bison geos-devel gdal-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel qt5-qtxmlpatterns-devel spatialindex-devel expat-devel proj-devel qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3 python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 python3-OWSLib qca-qt5-ossl qwt-qt5-devel qtkeychain-qt5-devel qwt-devel sip-devel libzip-devel |
|
|
dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static qt5-qtscript-devel qca-qt5-devel qca-qt5-ossl qt5-qt3d-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-devel python3-qscintilla-qt5 clang flex bison geos-devel gdal-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel qt5-qtxmlpatterns-devel spatialindex-devel expat-devel proj-devel qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3 python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 python3-OWSLib qca-qt5-ossl qwt-qt5-devel qtkeychain-qt5-devel qwt-devel sip-devel libzip-devel |
|
|
</PRE></div> |
|
|
|
|
|
<P> |
|
|
|
|
|
@@ -257,7 +257,7 @@ new subdirectory called `build` or `build-qt5` in it. |
|
|
=== Install build dependencies === |
|
|
|
|
|
``` |
|
|
dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static qt5-qtscript-devel qca-qt5-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-devel python3-qscintilla-qt5 clang flex bison geos-devel gdal-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel qt5-qtxmlpatterns-devel spatialindex-devel expat-devel proj-devel qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3 python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 python3-OWSLib qca-qt5-ossl qwt-qt5-devel qtkeychain-qt5-devel qwt-devel sip-devel libzip-devel |
|
|
dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static qt5-qtscript-devel qca-qt5-devel qca-qt5-ossl qt5-qt3d-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-devel python3-qscintilla-qt5 clang flex bison geos-devel gdal-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel qt5-qtxmlpatterns-devel spatialindex-devel expat-devel proj-devel qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3 python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 python3-OWSLib qca-qt5-ossl qwt-qt5-devel qtkeychain-qt5-devel qwt-devel sip-devel libzip-devel |
|
|
``` |
|
|
|
|
|
To build QGIS server additional dependencies are required: |
|
|
|
|
|
@@ -18,7 +18,10 @@ |
|
|
# is pushed to stable |
|
|
%if 0%{?fedora} > 26 |
|
|
%global configure_with_3d -D WITH_3D:BOOL=TRUE |
|
|
BuildRequires: qt5-qt3d-devel |
|
|
%global build_with_3d 1 |
|
|
%else |
|
|
%global configure_with_3d -D WITH_3D:BOOL=FALSE |
|
|
%global build_with_3d 0 |
|
|
%endif |
|
|
|
|
|
Name: qgis |
|
|
@@ -105,6 +108,9 @@ 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 |
|
|
@@ -330,6 +336,9 @@ 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} |
|
|
|
