Compare commits

..

No commits in common. "81e67d2ceddcec1093ae4b09ddcc091763b184bf" and "fd8a74c5064e408f6a97b0a48ea08c92661736d2" have entirely different histories.

View File

@ -181,14 +181,12 @@ gzip ChangeLog
-D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \
-D WITH_BINDINGS:BOOL=TRUE \
-D WITH_GRASS7:BOOL=TRUE \
-D GRASS_PREFIX7=%{_libdir}/grass \
-D GRASS_PREFIX=%{_libdir}/grass \
-D WITH_CUSTOM_WIDGETS:BOOL=TRUE \
-D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \
-D ENABLE_TESTS:BOOL=FALSE \
-D WITH_INTERNAL_QEXTSERIALPORT:BOOL=FALSE \
-D QEXTSERIALPORT_INCLUDE_DIR:STRING=%{_includedir}/QtExtSerialPort \
-D WITH_QSPATIALITE:BOOL=TRUE \
-D WITH_SERVER:BOOL=TRUE \
.
make %{?_smp_mflags}
@ -201,7 +199,9 @@ make install DESTDIR=%{buildroot}
# Install desktop file without connecting proprietary file types
desktop-file-install \
%if (0%{?rhel} && 0%{?rhel} < 7)
--vendor="fedora" \
%endif
--remove-mime-type="application/x-raster-ecw" \
--remove-mime-type="application/x-raster-mrsid" \
--dir=%{buildroot}%{_datadir}/applications \