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

@@ -0,0 +1,27 @@
+From 1719c04f014cb47284be50b335e9835d687c7dff Mon Sep 17 00:00:00 2001
+From: Antoine Belvire <antoine.belvire@opensuse.org>
+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
+

qgis.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Oct 11 05:50:41 UTC 2019 - Antoine Belvire <antoine.belvire@opensuse.org>
+
+- 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 <nrochard@gmail.com>
 

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