Accepting request 583774 from home:Guillaume_G:branches:Application:Geo

- Update to 3.0.0

OBS-URL: https://build.opensuse.org/request/show/583774
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=228

qgis-2.18.16.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8989e0f9003cfec41ff6cf984bb52866dd0f4d97fe88ec2326f1cf1140050835
-size 84976777

qgis-2.18.16.tar.bz2.md5

@@ -1 +0,0 @@
-5c751e4aa9cd8e4119fea6e216065a26  qgis-2.18.16.tar.bz2

qgis-3.0.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:598614b49cc57c3bf30961d77ac29e736738d7b7f3c471d30048ff31068e92e5
+size 94186303

qgis-3.0.0.tar.bz2.md5

@@ -0,0 +1 @@
+ff6e7ad62e98ef32af41db42640f345d  qgis-3.0.0.tar.bz2

qgis.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb 26 09:00:27 UTC 2018 - guillaume@opensuse.org
+
+- Update to 3.0.0
+
 -------------------------------------------------------------------
 Thu Jan 25 09:10:07 UTC 2018 - guillaume@opensuse.org
 

qgis.spec

@@ -17,7 +17,7 @@
 
 
 Name:           qgis
-Version:        2.18.16
+Version:        3.0.0
 Release:        0
 Summary:        QGIS is a Geographic Information System (GIS)
 License:        GPL-2.0
@@ -31,59 +31,94 @@ Source4:        https://qgis.org/downloads/%{name}-%{version}.tar.bz2.md5
 BuildRequires:  -post-build-checks
 BuildRequires:  FastCGI-devel
 BuildRequires:  bison >= 2.4
-BuildRequires:  cmake >= 2.8.6
+BuildRequires:  cmake >= 3.0.0
 BuildRequires:  fdupes
+BuildRequires:  filesystem
 BuildRequires:  flex >= 2.5.6
-BuildRequires:  gdal >= 1.4
+BuildRequires:  geos-devel >= 3.4
-BuildRequires:  grass >= 7
+BuildRequires:  gpsbabel
-BuildRequires:  grass-devel
+BuildRequires:  grass-devel >= 7.2
-BuildRequires:  gsl >= 1.8
+BuildRequires:  libqscintilla_qt5-devel
-BuildRequires:  gsl-devel
-%if 0%{?suse_version} < 1500
-BuildRequires:  libQtWebKit-devel
-%endif
-BuildRequires:  libexpat-devel
-BuildRequires:  libgdal-devel >= 1.4.0
-BuildRequires:  libgeos-devel >= 3.4
-BuildRequires:  libproj-devel
-BuildRequires:  libqca2-devel
-BuildRequires:  libqjson-devel
-BuildRequires:  libqscintilla-devel
-BuildRequires:  libqt4-devel >= 4.8
-BuildRequires:  libqt4-qt3support >= 4.8
 BuildRequires:  libspatialindex-devel
-BuildRequires:  libspatialindex4
+BuildRequires:  llvm-clang
-BuildRequires:  libspatialite-devel
+BuildRequires:  otb-devel
-BuildRequires:  postgresql-devel >= 8
+BuildRequires:  pkgconfig
-BuildRequires:  python-devel >= 2.7
+BuildRequires:  poppler-tools
-%if 0%{?suse_version} > 1325
+BuildRequires:  python-qscintilla-qt5-sip
-BuildRequires:  python-qscintilla-qt4
+BuildRequires:  python3-Jinja2
-BuildRequires:  python-qscintilla-qt4-sip
+BuildRequires:  python3-OWSLib
-BuildRequires:  libqscintilla_qt4-devel
+BuildRequires:  python3-PyYAML
-%endif
+BuildRequires:  python3-future
-BuildRequires:  python-qt4-devel
+BuildRequires:  python3-gdal
-BuildRequires:  python-sip-devel
+BuildRequires:  python3-psycopg2
-BuildRequires:  qwt-devel >= 5
+BuildRequires:  python3-pygments
-BuildRequires:  sqlite-devel >= 3.5
+BuildRequires:  python3-qscintilla-qt5
+BuildRequires:  python3-qt5-devel
+BuildRequires:  python3-sip-devel > 4.12
+BuildRequires:  python3-six
+BuildRequires:  python3-termcolor
+BuildRequires:  qtkeychain-qt5-devel >= 0.5
+BuildRequires:  sqlite-devel >= 3.0
 BuildRequires:  txt2tags
 BuildRequires:  unzip
 BuildRequires:  update-desktop-files
-Requires:       libqca2
+BuildRequires:  pkgconfig(Qt53DAnimation)
-Requires:       python-Jinja2
+BuildRequires:  pkgconfig(Qt53DCore)
-Requires:       python-Pygments
+BuildRequires:  pkgconfig(Qt53DExtras)
-Requires:       python-gdal
+BuildRequires:  pkgconfig(Qt53DInput)
-Requires:       python-matplotlib
+BuildRequires:  pkgconfig(Qt53DLogic)
-Requires:       python-psycopg2
+BuildRequires:  pkgconfig(Qt53DQuick)
-Requires:       python-qscintilla
+BuildRequires:  pkgconfig(Qt53DQuickAnimation)
-%if 0%{?suse_version} > 1325
+BuildRequires:  pkgconfig(Qt53DQuickExtras)
-Requires:       python-qscintilla-qt4
+BuildRequires:  pkgconfig(Qt53DQuickInput)
-Requires:       python-qscintilla-qt4-sip
+BuildRequires:  pkgconfig(Qt53DQuickRender)
-%endif
+BuildRequires:  pkgconfig(Qt53DQuickScene2D)
-Requires:       python-qt4
+BuildRequires:  pkgconfig(Qt53DRender)
-Requires:       python-qt4-utils
+BuildRequires:  pkgconfig(Qt5Core)
-Requires:       python-requests
+BuildRequires:  pkgconfig(Qt5DBus)
-Requires:       python-sip
+BuildRequires:  pkgconfig(Qt5Designer)
-Requires:       python-xml
+BuildRequires:  pkgconfig(Qt5Help)
+BuildRequires:  pkgconfig(Qt5Location)
+BuildRequires:  pkgconfig(Qt5Multimedia)
+BuildRequires:  pkgconfig(Qt5Network)
+BuildRequires:  pkgconfig(Qt5OpenGL)
+BuildRequires:  pkgconfig(Qt5Positioning)
+BuildRequires:  pkgconfig(Qt5PrintSupport)
+BuildRequires:  pkgconfig(Qt5Quick)
+BuildRequires:  pkgconfig(Qt5Qwt6)
+BuildRequires:  pkgconfig(Qt5Script)
+BuildRequires:  pkgconfig(Qt5Sensors)
+BuildRequires:  pkgconfig(Qt5Sql)
+BuildRequires:  pkgconfig(Qt5Svg)
+BuildRequires:  pkgconfig(Qt5Test)
+BuildRequires:  pkgconfig(Qt5UiTools)
+BuildRequires:  pkgconfig(Qt5WebKit)
+BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  pkgconfig(Qt5Xml)
+BuildRequires:  pkgconfig(Qt5XmlPatterns)
+BuildRequires:  pkgconfig(expat) >= 1.95
+BuildRequires:  pkgconfig(gdal) >= 2.1
+BuildRequires:  pkgconfig(gsl) >= 1.8
+BuildRequires:  pkgconfig(libpq) > 9.4
+BuildRequires:  pkgconfig(libzip)
+BuildRequires:  pkgconfig(proj) >= 4.4
+BuildRequires:  pkgconfig(python3) >= 3.4
+BuildRequires:  pkgconfig(qca2-qt5)
+BuildRequires:  pkgconfig(spatialite) >= 4.2.0
+# Fix the mess with qca-devel
+#!BuildIgnore:  libopenssl-1_0_0-devel
+Requires:       python3-Jinja2
+Requires:       python3-OWSLib
+Requires:       python3-PyYAML
+Requires:       python3-Pygments
+Requires:       python3-future
+Requires:       python3-gdal
+Requires:       python3-psycopg2
+# Those are not picked by obs
+Requires:       python3-qscintilla-qt5
+Requires:       python3-sip > 4.12
+Requires:       python3-six
+Requires:       python3-termcolor
 Recommends:     %{name}-sample-data
 Recommends:     apache2-mod_fcgid
 Recommends:     gpsbabel
@@ -92,37 +127,23 @@ Recommends:     libqca2-plugin-pkcs11
 Obsoletes:      qgis2
 Obsoletes:      qgis-master
 Obsoletes:      qgis-ltr
-# Fix TW dependencies
+
-%if 0%{?suse_version} > 1325
-BuildRequires:  libwx_gtk2u_qa-suse3 > 3.0
-BuildRequires:  python-wxWidgets > 3.0
-%else
-BuildRequires:  libwx_gtk2u_qa-2_8-0-stl
-BuildRequires:  python-wxWidgets
-%endif
-%if 0%{?suse_version} > 1325
-Requires:       libwx_gtk2u_qa-suse3 > 3.0
-Requires:       python-wxWidgets > 3.0
-%else
-Requires:       libwx_gtk2u_qa-2_8-0-stl
-Requires:       python-wxWidgets
-%endif
 
 %package devel
 Summary:        Development Libraries for the QGIS
 Group:          Development/Libraries/C and C++
-Requires:       python-qt4-devel
+Requires:       python3-qt5-devel
 Requires:       qgis = %{version}
 
 %package plugin-grass
 Summary:        GRASS Support Libraries for QGIS
 Group:          Productivity/Graphics/Visualization/Other
-Requires:       grass
+Requires:       grass > 7.0
 Requires:       grass-docs
 Requires:       qgis = %{version}
+Obsoletes:      qgis-plugin-grass < %{version}
 
 %package sample-data
-%define builddir build
 %define sampledir sample-data
 Summary:        QGIS sample data
 Group:          Productivity/Graphics/Visualization/Other
@@ -162,24 +183,25 @@ export PATH=$PATH:$QTDIR/bin
 
 %cmake \
   -DQGIS_LIB_SUBDIR=%{lib} \
+  -DWITH_3D=TRUE \
   -DWITH_BINDINGS=TRUE \
+  -DWITH_GRASS=TRUE \
+  -DWITH_GRASS7=TRUE \
+  -DGRASS_PREFIX7=/opt/grass\
   -DWITH_QSPATIALITE=TRUE \
-  -DWITH_PYSPATIALITE=TRUE \
   -DWITH_SERVER=TRUE \
   -DWITH_SERVER_PLUGINS=TRUE \
   -DWITH_POSTGRESQL=TRUE \
-%if 0%{?suse_version} >= 1500
   -DWITH_QTWEBKIT=FALSE \
-%endif
   -DPOSTGRES_LIBRARY=%{_libdir}/libpq.so \
   -DQGIS_PLUGIN_SUBDIR=%{lib}/qgis \
   -DQGIS_MANUAL_SUBDIR=share/man \
-  -DQWT_INCLUDE_DIR=%{_includedir}/qwt5 \
+  -DQWT_INCLUDE_DIR=%{_includedir}/qwt6 \
+  -DQCA_INCLUDE_DIR=%{_includedir}/qt5/Qca-qt5/QtCrypto \
   -DCMAKE_SKIP_RPATH=OFF \
   -Wno-dev
-#echo "for 'make' run first:"
+
 export QTDIR=%{_prefix}
-#echo "export PATH=$PATH:$QTDIR/bin"
 export PATH=$PATH:$QTDIR/bin
 %make_jobs
 
@@ -189,7 +211,7 @@ export PATH=$PATH:$QTDIR/bin
 mkdir -p %{buildroot}%{_datadir}/applications
 cp %{SOURCE1} %{buildroot}%{_datadir}/applications
 mkdir -p %{buildroot}%{_datadir}/pixmaps
-ln -s ../qgis/images/icons/qgis-icon.png %{buildroot}/%{_datadir}/pixmaps/qgis.png
+ln -s ../qgis/images/icons/qgis-icon-512x512.png %{buildroot}/%{_datadir}/pixmaps/qgis.png
 
 # Do not update .desktop files
 %suse_update_desktop_file -n %{name}
@@ -205,33 +227,29 @@ popd
 
 %files
 %{_bindir}/*
-%{_libdir}/libqgispython.s*
+%{_libdir}/libqgis*so*
-#%%{_libdir}/libqgis_*s*
+%{_libdir}/qt5/plugins/sqldrivers/libqsqlspatialite.so
-%{_libdir}/libqgis*s*
-%{_libdir}/qgis/
-%{_libdir}/qt4/plugins/sqldrivers/libqsqlspatialite.so
 %{_mandir}/man1/*
 %{_datadir}/qgis/*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/qgis.png
-%{_libdir}/qgis/qgis_help
+%dir %{_libdir}/qgis/
-%{_libdir}/qgis/crssync
+%{_libdir}/qgis/*
-%exclude %{_prefix}/lib/debug/
+%exclude %{_libdir}/libqgisgrass7.so
-%exclude %{_libdir}/libqgisgrass.so
+%exclude %{_libdir}/libqgisgrass7.so.*
-%exclude %{_libdir}/libqgisgrass.so.*
+%exclude %{_libdir}/qgis/plugins/libgrass*
-%exclude %{_libdir}/qgis/libgrass*
+%exclude %{_libdir}/qgis/grass
-#%%doc BUGS COPYING README
+%doc BUGS COPYING README.md
 
 %files devel
 %{_includedir}/qgis/*
 
 %files plugin-grass
-%{_libdir}/qgis/libgrass*
+%{_libdir}/libqgisgrass7.so
-#%%{_libdir}/libqgisgrass.so
+%{_libdir}/libqgisgrass7.so.*
-#%%{_libdir}/libqgisgrass.so.*
+# %{_libdir}/qgis/plugins/libgrass*
 %defattr(755,root,root)
-%{_libdir}/qgis/grass/bin/qgis.g.browser7
+%{_libdir}/qgis/grass
-%{_libdir}/qgis/grass/modules/qgis.*
 
 %files sample-data
 %{_datadir}/qgis/%{sampledir}