Merge branch 'master' of http://pkgs.fedoraproject.org/git/rpms/qgis into daniviga-2.18.19

This commit is contained in:
Daniele Viganò 2018-04-24 19:21:38 +02:00
commit 863954ab48

View File

@ -17,7 +17,6 @@ Name: qgis
Version: 2.18.19 Version: 2.18.19
Release: 1%{?dist} Release: 1%{?dist}
Summary: A user friendly Open Source Geographic Information System Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering
# http://hub.qgis.org/issues/3789 # http://hub.qgis.org/issues/3789
License: GPLv3+ with exceptions License: GPLv3+ with exceptions
@ -36,7 +35,6 @@ Source4: %{name}-server-README.fedora
Source5: %{name}-mime.xml Source5: %{name}-mime.xml
# Fix builds on 64-bit machines # Fix builds on 64-bit machines
# https://hub.qgis.org/issues/15602 # https://hub.qgis.org/issues/15602
# https://github.com/qgis/QGIS/commit/718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb.patch
Patch0: %{name}-lib64.patch Patch0: %{name}-lib64.patch
# Some plug-ins need Pyspatialite (bundled) # Some plug-ins need Pyspatialite (bundled)
@ -123,7 +121,6 @@ and USGS ASCII DEM.
%package devel %package devel
Summary: Development Libraries for the QGIS Summary: Development Libraries for the QGIS
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel %description devel
@ -131,7 +128,6 @@ Development packages for QGIS including the C header files.
%package grass %package grass
Summary: GRASS Support Libraries for QGIS Summary: GRASS Support Libraries for QGIS
Group: Applications/Engineering
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
# The plug-in requires more than just the grass-libs. # The plug-in requires more than just the grass-libs.
@ -151,7 +147,6 @@ Provides: %{name}-python = %{version}-%{release}
Provides: %{name}-python%{?_isa} = %{version}-%{release} Provides: %{name}-python%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-python < %{version}-%{release} Obsoletes: %{name}-python < %{version}-%{release}
Summary: Python integration and plug-ins for QGIS Summary: Python integration and plug-ins for QGIS
Group: Applications/Engineering
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: gdal-python Requires: gdal-python
Requires: PyQt4-webkit Requires: PyQt4-webkit
@ -171,7 +166,6 @@ Python integration and plug-ins for QGIS.
%package server %package server
Summary: FCGI-based OGC web map server Summary: FCGI-based OGC web map server
Group: Applications/Engineering
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: mod_fcgid Requires: mod_fcgid
Provides: mapserver = %{version}-%{release} Provides: mapserver = %{version}-%{release}