From 109b2f51c4955e883350dd481a87384ccea63d193773557bbc503619179c7bd8 Mon Sep 17 00:00:00 2001 From: Bruno Friedmann Date: Mon, 23 Sep 2019 06:07:17 +0000 Subject: [PATCH 1/4] Accepting request 732269 from home:1Antoine1:branches:Application:Geo - Conflict with qgis-ltr and qgis-master rather than obsolete them. - Make sample-data subpackage noarch. OBS-URL: https://build.opensuse.org/request/show/732269 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=270 --- qgis.changes | 6 ++++++ qgis.spec | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/qgis.changes b/qgis.changes index 0749e87..033f64e 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 19 19:03:47 UTC 2019 - Antoine Belvire + +- Conflict with qgis-ltr and qgis-master rather than obsolete them. +- Make sample-data subpackage noarch. + ------------------------------------------------------------------- Mon Sep 16 17:47:08 UTC 2019 - Dirk Stoecker diff --git a/qgis.spec b/qgis.spec index 9dfa52d..1867040 100644 --- a/qgis.spec +++ b/qgis.spec @@ -142,9 +142,9 @@ Requires: python3-termcolor Recommends: %{name}-sample-data Recommends: apache2-mod_fcgid Recommends: gpsbabel +Conflicts: qgis-ltr +Conflicts: qgis-master Obsoletes: qgis2 -Obsoletes: qgis-master -Obsoletes: qgis-ltr %package devel Summary: Development Libraries for QGIS @@ -169,6 +169,7 @@ GRASS plugin for QGIS required to interface with GRASS system. %define sampledir sample-data Summary: QGIS sample data Group: Productivity/Graphics/Visualization/Other +BuildArch: noarch %description QGIS is a Geographic Information System (GIS). QGIS supports vector, From 62fac315e50a1c9e53a993096bb0bed70191e40bb1ea0ccf0558aca255ba088a Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 1 Oct 2019 15:19:44 +0000 Subject: [PATCH 2/4] Accepting request 734134 from home:Le_Docteur Update to latest version 3.8.3 / Changes file proper OBS-URL: https://build.opensuse.org/request/show/734134 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=271 --- qgis-3.8.2.tar.bz2 | 3 --- qgis-3.8.2.tar.bz2.md5 | 1 - qgis-3.8.3.tar.bz2 | 3 +++ qgis-3.8.3.tar.bz2.md5 | 1 + qgis.changes | 5 +++++ qgis.spec | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 qgis-3.8.2.tar.bz2 delete mode 100644 qgis-3.8.2.tar.bz2.md5 create mode 100644 qgis-3.8.3.tar.bz2 create mode 100644 qgis-3.8.3.tar.bz2.md5 diff --git a/qgis-3.8.2.tar.bz2 b/qgis-3.8.2.tar.bz2 deleted file mode 100644 index 9f0008f..0000000 --- a/qgis-3.8.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d682f7625465a5b3596b3f7e83eddad86a60384fead9c81a6870704baffaddd -size 82257202 diff --git a/qgis-3.8.2.tar.bz2.md5 b/qgis-3.8.2.tar.bz2.md5 deleted file mode 100644 index 5951be3..0000000 --- a/qgis-3.8.2.tar.bz2.md5 +++ /dev/null @@ -1 +0,0 @@ -deb47d2e286b3da6f467364674fe2e98 qgis-3.8.2.tar.bz2 diff --git a/qgis-3.8.3.tar.bz2 b/qgis-3.8.3.tar.bz2 new file mode 100644 index 0000000..993b037 --- /dev/null +++ b/qgis-3.8.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3cca3e8483bc158cb8e972eb819a55a5734ba70f2c7da28ebc485864aafb17bd +size 82720462 diff --git a/qgis-3.8.3.tar.bz2.md5 b/qgis-3.8.3.tar.bz2.md5 new file mode 100644 index 0000000..ce0cf13 --- /dev/null +++ b/qgis-3.8.3.tar.bz2.md5 @@ -0,0 +1 @@ +b7b4b5fba56b6b67e7de3fbe0c39f588 qgis-3.8.3.tar.bz2 diff --git a/qgis.changes b/qgis.changes index 033f64e..f3e8236 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 30 17:00:13 UTC 2019 - Nicolas Rochard + +- Update to latest version 3.8.3 (monthly bugfix) + ------------------------------------------------------------------- Thu Sep 19 19:03:47 UTC 2019 - Antoine Belvire diff --git a/qgis.spec b/qgis.spec index 1867040..6867caa 100644 --- a/qgis.spec +++ b/qgis.spec @@ -19,7 +19,7 @@ %bcond_with otb Name: qgis -Version: 3.8.2 +Version: 3.8.3 Release: 0 Summary: A Geographic Information System (GIS) License: GPL-2.0-only From 11a46e913b4dccf238d3c1a06a11a7a847b8eed8bff05e21163db50531f46dab Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 14 Oct 2019 07:15:15 +0000 Subject: [PATCH 3/4] Accepting request 738084 from home:1Antoine1:branches:Application:Geo - Add qgis-3.8.3-reproducible.patch: Sort desktop file content to get a more reproducible build. - Fix unowned directory issues. - Stop disabling post-build-checks. OBS-URL: https://build.opensuse.org/request/show/738084 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=272 --- qgis-3.8.3-reproducible.patch | 27 +++++++++++++++++++++++++++ qgis.changes | 8 ++++++++ qgis.spec | 18 +++++++++++++++--- 3 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 qgis-3.8.3-reproducible.patch diff --git a/qgis-3.8.3-reproducible.patch b/qgis-3.8.3-reproducible.patch new file mode 100644 index 0000000..cad37b4 --- /dev/null +++ b/qgis-3.8.3-reproducible.patch @@ -0,0 +1,27 @@ +From 1719c04f014cb47284be50b335e9835d687c7dff Mon Sep 17 00:00:00 2001 +From: Antoine Belvire +Date: Sat, 12 Oct 2019 11:00:10 +0200 +Subject: [PATCH] Sort translations in desktop file + +Randomness is introduced by usage of Python's glob. Let's sort the result to +get a more reproducible build. +--- + scripts/ts2appinfo.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/ts2appinfo.py b/scripts/ts2appinfo.py +index 5fadd30e30..a9018a26c3 100644 +--- a/scripts/ts2appinfo.py ++++ b/scripts/ts2appinfo.py +@@ -57,7 +57,7 @@ except AttributeError: + + app = QCoreApplication(argvb) + +-for qm in glob(sys.argv[1] + "/output/i18n/qgis_*.qm"): ++for qm in sorted(glob(sys.argv[1] + "/output/i18n/qgis_*.qm")): + translator = QTranslator() + translator.load(qm) + +-- +2.23.0 + diff --git a/qgis.changes b/qgis.changes index f3e8236..d5b8d94 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Oct 11 05:50:41 UTC 2019 - Antoine Belvire + +- Add qgis-3.8.3-reproducible.patch: Sort desktop file content to + get a more reproducible build. +- Fix unowned directory issues. +- Stop disabling post-build-checks. + ------------------------------------------------------------------- Mon Sep 30 17:00:13 UTC 2019 - Nicolas Rochard diff --git a/qgis.spec b/qgis.spec index 6867caa..244daca 100644 --- a/qgis.spec +++ b/qgis.spec @@ -33,7 +33,8 @@ Source3: qgis_sample_data.zip Patch0: fix_grass_qt511.patch # PATCH-FIX-UPSTREAM Missing include https://github.com/qgis/QGIS/issues/30316 Patch1: ef8f06330f57882f740cfe7f8f3659b54b1bb1fb.patch -BuildRequires: -post-build-checks +# PATCH-FIX-UPSTREAM fix randomness in desktop file translations +Patch2: qgis-3.8.3-reproducible.patch BuildRequires: FastCGI-devel BuildRequires: bison >= 2.4 BuildRequires: cmake >= 3.0.0 @@ -188,6 +189,7 @@ QGIS sample data with raster, vector, gps files and a GRASS location from the Al %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 # 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 @@ -241,7 +243,6 @@ ln -s ../qgis/images/icons/qgis-icon-512x512.png %{buildroot}/%{_datadir}/pixmap # Rename .desktop file mv %{buildroot}%{_datadir}/applications/org.qgis.qgis.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop - # Install sample data pushd %{buildroot}%{_datadir}/qgis unzip %{SOURCE3} @@ -256,9 +257,19 @@ popd %{_libdir}/libqgis*so* %{_libdir}/qt5/plugins/sqldrivers/libqsqlspatialite.so %{_mandir}/man1/* -%{_datadir}/qgis/* +%{_datadir}/qgis %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/qgis.png +# Own directories for icon size not provided by hicolor-icon-theme +%dir %{_datadir}/icons/hicolor/42x42 +%dir %{_datadir}/icons/hicolor/42x42/apps +%dir %{_datadir}/icons/hicolor/42x42/mimetypes +%dir %{_datadir}/icons/hicolor/80x80 +%dir %{_datadir}/icons/hicolor/80x80/apps +%dir %{_datadir}/icons/hicolor/80x80/mimetypes +%dir %{_datadir}/icons/hicolor/8x8 +%dir %{_datadir}/icons/hicolor/8x8/apps +%dir %{_datadir}/icons/hicolor/8x8/mimetypes %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/*/apps/*.svg %{_datadir}/icons/hicolor/*/mimetypes/*.png @@ -293,6 +304,7 @@ popd %endif %files sample-data +%dir %{_datadir}/qgis %{_datadir}/qgis/%{sampledir} %post -p /sbin/ldconfig From c2afbc6f689b5426fd670bbeb164b8366538a1d37ceec34ad8d1cdd5087a7f8b Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Sun, 27 Oct 2019 14:24:11 +0000 Subject: [PATCH 4/4] Accepting request 743226 from home:1Antoine1:branches:Application:Geo - Remove gpsbabel from build requirements: It's only recommended at runtime. This fixes build on ppc64(le) for which gpsbabel is not available. - Remove obsolete filters in qgis.rpmlintrc. OBS-URL: https://build.opensuse.org/request/show/743226 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=273 --- qgis.changes | 8 ++++++++ qgis.rpmlintrc | 5 ----- qgis.spec | 1 - 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/qgis.changes b/qgis.changes index d5b8d94..6fc1c33 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Oct 16 06:15:34 UTC 2019 - Antoine Belvire + +- Remove gpsbabel from build requirements: It's only recommended + at runtime. This fixes build on ppc64(le) for which gpsbabel is + not available. +- Remove obsolete filters in qgis.rpmlintrc. + ------------------------------------------------------------------- Fri Oct 11 05:50:41 UTC 2019 - Antoine Belvire diff --git a/qgis.rpmlintrc b/qgis.rpmlintrc index aa75e21..414a288 100644 --- a/qgis.rpmlintrc +++ b/qgis.rpmlintrc @@ -1,8 +1,3 @@ addFilter("devel-file-in-non-devel-package .*/usr/lib/libqgis*.*") addFilter("devel-file-in-non-devel-package .*/usr/lib64/libqgis*.*") -addFilter("devel-file-in-non-devel-package .*/usr/share/qgis/python/markupsafe/_speedups.c") addFilter("arch-dependent-file-in-usr-share .*/usr/share/qgis/python/qgis/.*") -addFilter("arch-dependent-file-in-usr-share .*/usr/share/qgis/python/markupsafe/_speedups.so") -addFilter("arch-dependent-file-in-usr-share .*/usr/share/qgis/python/pyspatialite/_spatialite.so") - - diff --git a/qgis.spec b/qgis.spec index 244daca..dd1529e 100644 --- a/qgis.spec +++ b/qgis.spec @@ -42,7 +42,6 @@ BuildRequires: fdupes BuildRequires: filesystem BuildRequires: flex >= 2.5.6 BuildRequires: geos-devel >= 3.4 -BuildRequires: gpsbabel %if %{with grass} BuildRequires: grass-devel >= 7.2 %endif