QGIS 3.0 #16

Closed
dani wants to merge 19 commits from daniviga-2.99 into daniviga-2.18
Showing only changes of commit 5f79adb3dd - Show all commits

View File

@ -181,7 +181,7 @@ gzip ChangeLog
-D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \ -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \
-D WITH_BINDINGS:BOOL=TRUE \ -D WITH_BINDINGS: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 \
@ -200,9 +200,7 @@ make install DESTDIR=%{buildroot}
# Install desktop file without connecting proprietary file types # Install desktop file without connecting proprietary file types
desktop-file-install \ desktop-file-install \
%if (0%{?rhel} && 0%{?rhel} < 7)
--vendor="fedora" \ --vendor="fedora" \
%endif
--remove-mime-type="application/x-raster-ecw" \ --remove-mime-type="application/x-raster-ecw" \
--remove-mime-type="application/x-raster-mrsid" \ --remove-mime-type="application/x-raster-mrsid" \
--dir=%{buildroot}%{_datadir}/applications \ --dir=%{buildroot}%{_datadir}/applications \