Require grass version in BR instead of Req
This will avoid building with a different version than intended. The sub-package dependencies is taken care of by soname versions.
This commit is contained in:
parent
aec04efa3f
commit
fd81d10f43
21
qgis.spec
21
qgis.spec
|
@ -11,6 +11,12 @@
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
# WARNING: Rebuild QGIS whenever a new version of GRASS is shipped! Even though
|
||||||
|
# the soname might stay the same, it won't work anymore.
|
||||||
|
#http://hub.qgis.org/issues/5274
|
||||||
|
%global grass_version 7.0.4
|
||||||
|
|
||||||
#TODO: Run test suite (see debian/rules)
|
#TODO: Run test suite (see debian/rules)
|
||||||
|
|
||||||
Name: qgis
|
Name: qgis
|
||||||
|
@ -50,7 +56,7 @@ BuildRequires: fcgi-devel
|
||||||
BuildRequires: flex bison
|
BuildRequires: flex bison
|
||||||
BuildRequires: gdal-devel
|
BuildRequires: gdal-devel
|
||||||
BuildRequires: geos-devel
|
BuildRequires: geos-devel
|
||||||
BuildRequires: grass-devel
|
BuildRequires: grass-devel = %{grass_version}
|
||||||
BuildRequires: gsl-devel
|
BuildRequires: gsl-devel
|
||||||
|
|
||||||
%ifarch ppc ppc64
|
%ifarch ppc ppc64
|
||||||
|
@ -127,12 +133,8 @@ 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.
|
||||||
# This questions the sense of the libs package is questionable
|
# This questions the sense of the libs package.
|
||||||
|
Requires: grass
|
||||||
# WARNING: Rebuild QGIS whenever a new version of GRASS is shipped! Even though
|
|
||||||
# the soname might stay the same, it won't work anymore.
|
|
||||||
#http://hub.qgis.org/issues/5274
|
|
||||||
Requires: grass = 7.0.4
|
|
||||||
|
|
||||||
%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.
|
||||||
|
@ -406,6 +408,11 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 06 2016 Volker Froehlich <volker27@gmx.at> - 2.14.3-2
|
||||||
|
- Move grass version to BR. This will avoid building with a
|
||||||
|
different version than intended. The sub-package dependencies
|
||||||
|
is taken care of by soname versions.
|
||||||
|
|
||||||
* Mon May 23 2016 Volker Froehlich <volker27@gmx.at> - 2.14.3-1
|
* Mon May 23 2016 Volker Froehlich <volker27@gmx.at> - 2.14.3-1
|
||||||
- New upstream release
|
- New upstream release
|
||||||
|
|
||||||
|
|
Reference in New Issue
Block a user