diff --git a/qgis.spec b/qgis.spec index 8786708..20b601d 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,5 +1,3 @@ -%global configure_with_spatialite -D WITH_QSPATIALITE:BOOL=TRUE - #TODO: Run test suite (see debian/rules) Name: qgis @@ -182,31 +180,14 @@ gzip ChangeLog -D QGIS_MANUAL_SUBDIR=/share/man \ -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \ -D WITH_BINDINGS:BOOL=TRUE \ - -D WITH_GRASS:BOOL=TRUE \ -D WITH_GRASS7:BOOL=TRUE \ -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_DATEUTIL:BOOL=FALSE \ - -D WITH_INTERNAL_HTTPLIB2:BOOL=FALSE \ - -D WITH_INTERNAL_JINJA2:BOOL=FALSE \ - -D WITH_INTERNAL_MARKUPSAFE:BOOL=FALSE \ - -D WITH_INTERNAL_OWSLIB:BOOL=FALSE \ - -D WITH_INTERNAL_PYGMENTS:BOOL=FALSE \ - -D WITH_INTERNAL_PYTZ:BOOL=FALSE \ -D WITH_INTERNAL_QEXTSERIALPORT:BOOL=FALSE \ - -D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \ - -D WITH_INTERNAL_SIX:BOOL=FALSE \ - -D WITH_INTERNAL_YAML:BOOL=FALSE \ - -D WITH_PYSPATIALITE:BOOL=FALSE \ - -D WITH_SERVER:BOOL=TRUE \ - -D WITH_TOUCH:BOOL=TRUE \ - %{configure_with_spatialite} \ + -D WITH_QSPATIALITE:BOOL=TRUE . - #-D WITH_QTMOBILITY:BOOL=TRUE \ - # Doesn't build, as of 2.10, known issue - #-D WITH_GLOBE:BOOL=TRUE make %{?_smp_mflags} @@ -304,7 +285,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_libdir}/lib%{name}_gui.so.* %{_libdir}/lib%{name}_networkanalysis.so.* %{_libdir}/%{name}/ -%{_qt4_prefix}/plugins/sqldrivers/libqsqlspatialite.so +%{_qt5_prefix}/plugins/sqldrivers/libqsqlspatialite.so %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %dir %{_datadir}/%{name}/ @@ -326,7 +307,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_datadir}/%{name}/FindQGIS.cmake %{_includedir}/%{name}/ %{_libdir}/lib%{name}*.so -%{?_qt4_plugindir}/designer/libqgis_customwidgets.so* +%{?_qt5_plugindir}/designer/libqgis_customwidgets.so* %files grass %{_libdir}/lib%{name}grass*.so.*