dani/copr-dani-qgis
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

Add compatibility with GRASS 7.4 #24

Merged
dani merged 1 commits from grass74-f27 into daniviga-2.18 2018-05-21 08:55:51 +02:00
Conversation 0 Commits 1 Files Changed 1 +10 -2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d8e957e901 - Show all commits

12
qgis.spec
View File

@ -11,6 +11,12 @@
%endif %endif
%endif %endif
%if 0%{?fedora} >= 27
%define grass grass74
%else
%define grass grass72
%endif
#TODO: Run test suite (see debian/rules) #TODO: Run test suite (see debian/rules)
Name: qgis Name: qgis
@ -215,9 +221,8 @@ gzip ChangeLog
-D QGIS_MANUAL_SUBDIR=/share/man \ -D QGIS_MANUAL_SUBDIR=/share/man \
-D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \ -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \
-D WITH_BINDINGS:BOOL=TRUE \ -D WITH_BINDINGS:BOOL=TRUE \
-D WITH_GRASS:BOOL=TRUE \
-D WITH_GRASS7:BOOL=TRUE \ -D WITH_GRASS7:BOOL=TRUE \
-D GRASS_PREFIX=%{_libdir}/grass \ -D GRASS_PREFIX7=%{_libdir}/%{grass} \
-D WITH_CUSTOM_WIDGETS:BOOL=TRUE \ -D WITH_CUSTOM_WIDGETS:BOOL=TRUE \
-D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \ -D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \
-D ENABLE_TESTS:BOOL=FALSE \ -D ENABLE_TESTS:BOOL=FALSE \
@ -407,6 +412,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog %changelog
* Fri Apr 27 2018 Daniele Viganò <daniele@vigano.me> - 2.18.19-2
- Rebuild for GRASS 7.4
* Mon Apr 23 2018 Daniele Viganò <daniele@vigano.me> - 2.18.19-1 * Mon Apr 23 2018 Daniele Viganò <daniele@vigano.me> - 2.18.19-1
- New upstream release - New upstream release