From 9f9feed5d40da99ed6c7d38325a4d4262c663bcca136e657e06a1161f6b38e14 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 20 Jul 2018 07:18:10 +0000 Subject: [PATCH] Accepting request 624204 from home:bruno_friedmann:branches:Application:Geo - Update to 3.2.0 release - Packaging: + Remove merged upstream patch fix_3d_qt511.patch + Fix %file list + Reactivate sed env interpreter line + spec-cleaner minimal (date, licence) OBS-URL: https://build.opensuse.org/request/show/624204 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=233 --- fix_3d_qt511.patch | 12 ------------ qgis-3.0.3.tar.bz2 | 3 --- qgis-3.0.3.tar.bz2.md5 | 1 - qgis-3.2.0.tar.bz2 | 3 +++ qgis-3.2.0.tar.bz2.md5 | 1 + qgis.changes | 10 ++++++++++ qgis.spec | 26 +++++++++++++++----------- 7 files changed, 29 insertions(+), 27 deletions(-) delete mode 100644 fix_3d_qt511.patch delete mode 100644 qgis-3.0.3.tar.bz2 delete mode 100644 qgis-3.0.3.tar.bz2.md5 create mode 100644 qgis-3.2.0.tar.bz2 create mode 100644 qgis-3.2.0.tar.bz2.md5 diff --git a/fix_3d_qt511.patch b/fix_3d_qt511.patch deleted file mode 100644 index 9221141..0000000 --- a/fix_3d_qt511.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup a/src/3d/CMakeLists.txt b/src/3d/CMakeLists.txt ---- a/src/3d/CMakeLists.txt 2018-05-18 14:01:05.000000000 +0200 -+++ b/src/3d/CMakeLists.txt 2018-06-11 14:59:34.456085339 +0200 -@@ -145,7 +145,7 @@ INCLUDE_DIRECTORIES(SYSTEM - - ADD_LIBRARY(qgis_3d SHARED ${QGIS_3D_SRCS} ${QGIS_3D_MOC_SRCS} ${QGIS_3D_HDRS} ${QGIS_3D_RCC_SRCS}) - --qt5_use_modules(qgis_3d 3DCore 3DRender 3DInput 3DLogic 3DExtras) -+TARGET_LINK_LIBRARIES(qgis_3d Qt5::3DCore Qt5::3DRender Qt5::3DInput Qt5::3DLogic Qt5::3DExtras) - - GENERATE_EXPORT_HEADER( - qgis_3d diff --git a/qgis-3.0.3.tar.bz2 b/qgis-3.0.3.tar.bz2 deleted file mode 100644 index ec16b8d..0000000 --- a/qgis-3.0.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b647468a3c7b78a25fee19a731c6bcf1efc6c1ebc98780d071573561e7abd2a7 -size 94462631 diff --git a/qgis-3.0.3.tar.bz2.md5 b/qgis-3.0.3.tar.bz2.md5 deleted file mode 100644 index 8c72d43..0000000 --- a/qgis-3.0.3.tar.bz2.md5 +++ /dev/null @@ -1 +0,0 @@ -32bd3368339ceb6404c8f46d49146ec8 qgis-3.0.3.tar.bz2 diff --git a/qgis-3.2.0.tar.bz2 b/qgis-3.2.0.tar.bz2 new file mode 100644 index 0000000..bbfc5f4 --- /dev/null +++ b/qgis-3.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0bc7cc5bdec05bac1f0f50250ce705130b5c3a7df3f0115f26743431fca2beff +size 96177281 diff --git a/qgis-3.2.0.tar.bz2.md5 b/qgis-3.2.0.tar.bz2.md5 new file mode 100644 index 0000000..cd15fec --- /dev/null +++ b/qgis-3.2.0.tar.bz2.md5 @@ -0,0 +1 @@ +71ee4081ceaa231930ae984b32848906 qgis-3.2.0.tar.bz2 diff --git a/qgis.changes b/qgis.changes index 5a9650c..5287799 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jul 17 07:11:33 UTC 2018 - bruno@ioda-net.ch + +- Update to 3.2.0 release +- Packaging: + + Remove merged upstream patch fix_3d_qt511.patch + + Fix %file list + + Reactivate sed env interpreter line + + spec-cleaner minimal (date, licence) + ------------------------------------------------------------------- Mon Jun 11 14:24:54 UTC 2018 - bruno@ioda-net.ch diff --git a/qgis.spec b/qgis.spec index 51c1050..7866ef6 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ # # spec file for package qgis # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,10 +17,10 @@ Name: qgis -Version: 3.0.3 +Version: 3.2.0 Release: 0 Summary: QGIS is a Geographic Information System (GIS) -License: GPL-2.0 +License: GPL-2.0-only Group: Productivity/Graphics/Visualization/Other URL: https://qgis.org/ Source: https://qgis.org/downloads/%{name}-%{version}.tar.bz2 @@ -30,7 +30,6 @@ Source3: qgis_sample_data.zip Source4: https://qgis.org/downloads/%{name}-%{version}.tar.bz2.md5 # Headers in Qt5.11 were cleaned up to no longer include unneeded other headers. Patch0: fix_grass_qt511.patch -Patch1: fix_3d_qt511.patch BuildRequires: -post-build-checks BuildRequires: FastCGI-devel BuildRequires: bison >= 2.4 @@ -127,7 +126,6 @@ Obsoletes: qgis2 Obsoletes: qgis-master Obsoletes: qgis-ltr - %package devel Summary: Development Libraries for the QGIS Group: Development/Libraries/C and C++ @@ -167,9 +165,9 @@ QGIS sample data with free raster, vector, gps files and a GRASS location from A %prep %setup -q %patch0 -p1 -%patch1 -p1 -#Fix shebang -#sed -i "s,^#!/usr/bin/env python$,#!/usr/bin/python," ./src/plugins/grass/modules/*.py +# Remove bad env and python version in grass plugin +sed -i 's,^#!%{_bindir}/env python$,#!%{_bindir}/python3,g' src/plugins/grass/scripts/*.py +sed -i 's,^#!%{_bindir}/env python3$,#!%{_bindir}/python3,g' src/plugins/grass/scripts/*.py %build export CFLAGS="%{optflags}" @@ -233,21 +231,27 @@ popd %{_datadir}/qgis/* %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/qgis.png +%{_datadir}/metainfo/org.qgis.qgis.appdata.xml %dir %{_libdir}/qgis/ %{_libdir}/qgis/* %exclude %{_libdir}/libqgisgrass7.so %exclude %{_libdir}/libqgisgrass7.so.* -%exclude %{_libdir}/qgis/plugins/libgrass* +%exclude %{_libdir}/qgis/libgrassplugin7.so +%exclude %{_libdir}/qgis/libgrassprovider7.so +%exclude %{_libdir}/qgis/libgrassrasterprovider7.so %exclude %{_libdir}/qgis/grass -%doc BUGS COPYING README.md +%license COPYING +%doc BUGS README.md %files devel %{_includedir}/qgis/* %files plugin-grass +%{_libdir}/qgis/libgrassplugin7.so +%{_libdir}/qgis/libgrassprovider7.so +%{_libdir}/qgis/libgrassrasterprovider7.so %{_libdir}/libqgisgrass7.so %{_libdir}/libqgisgrass7.so.* -# %{_libdir}/qgis/plugins/libgrass* %defattr(755,root,root) %{_libdir}/qgis/grass