Accepting request 692788 from home:bruno_friedmann:branches:Application:Geo

- Update to bugfix 3.6.1 version
- Update URL to https
- Remove postgresql-server-devel build require, add
  -DPOSTGRES_INCLUDE_DIR=%{_includedir}/pgsql to enable libpq
- Force proj6 usage (gdal 2.4.1 and grass 7.6.1 are proj6 ready)
  + Remove all proj5 dependencies

OBS-URL: https://build.opensuse.org/request/show/692788
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=247
This commit is contained in:
Nicolas Rochard 2019-04-10 07:55:42 +00:00 committed by Git OBS Bridge
parent 68e1a732d3
commit 01dd359c30
6 changed files with 18 additions and 10 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:11192b4a541d46990a91450bb72c29fc7f08e7f400c15da99431645878adaccf
size 75342119

View File

@ -1 +0,0 @@
a70cfe78e58797e6af544871e4cc0d80 qgis-3.6.0.tar.bz2

3
qgis-3.6.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0487e6554b9b9cf649582c3498e8365ed69a9ea2570bd446cbd418348c048813
size 75773832

1
qgis-3.6.1.tar.bz2.md5 Normal file
View File

@ -0,0 +1 @@
2c31a64c7a6f0ef2189a436d076a4977 qgis-3.6.1.tar.bz2

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sat Apr 6 20:00:18 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>
- Update to bugfix 3.6.1 version
- Update URL to https
- Remove postgresql-server-devel build require, add
-DPOSTGRES_INCLUDE_DIR=%{_includedir}/pgsql to enable libpq
- Force proj6 usage (gdal 2.4.1 and grass 7.6.1 are proj6 ready)
+ Remove all proj5 dependencies
-------------------------------------------------------------------
Thu Apr 4 08:23:55 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -17,7 +17,7 @@
Name: qgis
Version: 3.6.0
Version: 3.6.1
Release: 0
Summary: QGIS is a Geographic Information System (GIS)
License: GPL-2.0-only
@ -54,9 +54,6 @@ BuildRequires: opencl-cpp-headers
BuildRequires: otb-devel
BuildRequires: pkgconfig
BuildRequires: poppler-tools
%if 0%{?suse_version} > 1500
BuildRequires: postgresql-server-devel
%endif
BuildRequires: python-qscintilla-qt5-sip
BuildRequires: python3-Jinja2
BuildRequires: python3-OWSLib
@ -115,7 +112,7 @@ BuildRequires: pkgconfig(gdal) >= 2.1
BuildRequires: pkgconfig(gsl) >= 1.8
BuildRequires: pkgconfig(libpq) > 9.4
BuildRequires: pkgconfig(libzip)
BuildRequires: proj5-devel
BuildRequires: pkgconfig(proj) >= 6.0
BuildRequires: pkgconfig(python3) >= 3.4
BuildRequires: pkgconfig(qca2-qt5)
BuildRequires: pkgconfig(spatialite) >= 4.2.0
@ -202,12 +199,13 @@ export PATH=$PATH:$QTDIR/bin
-DWITH_BINDINGS=TRUE \
-DWITH_GRASS=TRUE \
-DWITH_GRASS7=TRUE \
-DGRASS_PREFIX7=/opt/grass\
-DGRASS_PREFIX7=/opt/grass76\
-DWITH_QSPATIALITE=TRUE \
-DWITH_SERVER=TRUE \
-DWITH_SERVER_PLUGINS=TRUE \
-DWITH_POSTGRESQL=TRUE \
-DPOSTGRES_LIBRARY=%{_libdir}/libpq.so \
-DPOSTGRES_INCLUDE_DIR=%{_includedir}/pgsql \
-DQGIS_PLUGIN_SUBDIR=%{lib}/qgis \
-DQGIS_MANUAL_SUBDIR=share/man \
-DQWT_INCLUDE_DIR=%{_includedir}/qwt6 \