BR qca2 instead of qca

This commit is contained in:
Volker Fröhlich 2016-04-20 22:42:54 +02:00
parent 613266ee29
commit 472f8236f1

View File

@ -15,7 +15,7 @@
Name: qgis Name: qgis
Version: 2.14.1 Version: 2.14.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: A user friendly Open Source Geographic Information System Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering Group: Applications/Engineering
@ -69,7 +69,8 @@ BuildRequires: PyQt4-devel
BuildRequires: PyQwt-devel BuildRequires: PyQwt-devel
%endif %endif
BuildRequires: python2-devel BuildRequires: python2-devel
BuildRequires: qca-devel # qca2 is a virtual provides of qca. Put here to make things easier for EPEL!
BuildRequires: qca2-devel
BuildRequires: qextserialport-devel BuildRequires: qextserialport-devel
BuildRequires: qscintilla-devel BuildRequires: qscintilla-devel
BuildRequires: qscintilla-python-devel BuildRequires: qscintilla-python-devel
@ -131,7 +132,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
# WARNING: Rebuild QGIS whenever a new version of GRASS is shipped! Even though # WARNING: Rebuild QGIS whenever a new version of GRASS is shipped! Even though
# the soname might stay the same, it won't work anymore. # the soname might stay the same, it won't work anymore.
#http://hub.qgis.org/issues/5274 #http://hub.qgis.org/issues/5274
Requires: grass => 7.0.3 Requires: grass = 7.0.3
%description grass %description grass
GRASS plugin for QGIS required to interface with the GRASS system. GRASS plugin for QGIS required to interface with the GRASS system.
@ -405,6 +406,11 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog %changelog
* Wed Apr 20 2016 Volker Froehlich <volker27@gmx.at> - 2.14.1-2
- Change BR of qca to qca2 to make things easier in EPEL
- Rebuild for BZ #1327360
- Make the requires on grass match an exact version again
* Sun Mar 27 2016 Volker Froehlich <volker27@gmx.at> - 2.14.1-1 * Sun Mar 27 2016 Volker Froehlich <volker27@gmx.at> - 2.14.1-1
- New upstream release - New upstream release
- Resolve the false sub-package dependency of python on server - Resolve the false sub-package dependency of python on server