Hello community, here is the log from the commit of package grass for openSUSE:Factory checked in at 2020-04-29 20:51:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grass (Old) and /work/SRC/openSUSE:Factory/.grass.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grass" Wed Apr 29 20:51:29 2020 rev:4 rq:798800 version:7.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/grass/grass.changes 2020-04-28 22:33:09.809842547 +0200 +++ /work/SRC/openSUSE:Factory/.grass.new.2738/grass.changes 2020-04-29 20:53:34.109160892 +0200 @@ -1,0 +2,8 @@ +Tue Apr 28 15:52:46 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org> + +- Update to 7.8.2: + * important PROJ 4/5/6 related datum handling fixes + * wxGUI fixes + * fix for the vector import from PostGIS databases + +------------------------------------------------------------------- Old: ---- grass-7.8.1.md5sum grass-7.8.1.tar.gz New: ---- grass-7.8.2.md5sum grass-7.8.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grass.spec ++++++ --- /var/tmp/diff_new_pack.5oNvza/_old 2020-04-29 20:53:36.045165327 +0200 +++ /var/tmp/diff_new_pack.5oNvza/_new 2020-04-29 20:53:36.049165337 +0200 @@ -1,7 +1,7 @@ # # spec file for package grass # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,11 +17,24 @@ # Notice to maintainer : move this package to real lfhs - %define shortver 78 - +# Post Leap 42 / TW +%if 0%{?suse_version} > 1325 +BuildRequires: wxWidgets-devel >= 3.0 +%if 0%{?suse_version} >= 1550 +BuildRequires: python3-wxPython +%else +BuildRequires: python-wxWidgets-devel >= 3.0 +%endif +%else +%define _use_internal_dependency_generator 0 +%define __find_requires %wx_requires +# Don't work for SLE why ? +# BuildRequires: python-wxWidgets >= 2.8 +BuildRequires: wxWidgets-devel >= 2.8 +%endif Name: grass -Version: 7.8.1 +Version: 7.8.2 Release: 0 Summary: Geographic Resources Analysis Support System License: GPL-2.0-or-later @@ -29,23 +42,6 @@ URL: https://grass.osgeo.org/ Source: https://grass.osgeo.org/grass%{shortver}/source/%{name}-%{version}.tar.gz Source1: https://grass.osgeo.org/grass%{shortver}/source/%{name}-%{version}.md5sum -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: fftw3 -Requires: proj >= 6 -%if 0%{suse_version} >= 1550 -Requires: python3-wxPython -%else -Requires: python-wxWidgets >= 2.8 -%endif -Requires: python3 -Requires: python3-dateutil -Requires: python3-numpy -Requires: python3-opengl -Requires: python3-xml -Requires: sqlite >= 3 -Requires: unixODBC -Requires: xterm -Recommends: grass-doc BuildRequires: -post-build-checks BuildRequires: bison BuildRequires: blas-devel @@ -62,7 +58,6 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel -BuildRequires: libtiff-devel BuildRequires: libzstd-devel BuildRequires: man BuildRequires: mysql-devel @@ -82,22 +77,23 @@ BuildRequires: unixODBC-devel BuildRequires: xorg-x11-Mesa-devel BuildRequires: zlib-devel -# Post Leap 42 / TW -%if 0%{?suse_version} > 1325 -%if 0%{suse_version} >= 1550 -BuildRequires: python3-wxPython -%else -BuildRequires: python-wxWidgets-devel >= 3.0 -%endif -BuildRequires: wxWidgets-devel >= 3.0 +Requires: fftw3 +Requires: proj >= 6 +Requires: python3 +Requires: python3-dateutil +Requires: python3-numpy +Requires: python3-opengl +Requires: python3-xml +Requires: sqlite >= 3 +Requires: unixODBC +Requires: xterm +Recommends: grass-doc +Obsoletes: grass7 +%if 0%{?suse_version} >= 1550 +Requires: python3-wxPython %else -# Don't work for SLE why ? -# BuildRequires: python-wxWidgets >= 2.8 -BuildRequires: wxWidgets-devel >= 2.8 -%define _use_internal_dependency_generator 0 -%define __find_requires %wx_requires +Requires: python-wxWidgets >= 2.8 %endif -Obsoletes: grass7 %package doc Summary: Documentation for GRASS GIS 7 @@ -152,18 +148,18 @@ --with-curses \ --with-cxx \ --with-fftw \ - --with-freetype --with-freetype-includes=/usr/include/freetype2 \ - --with-gdal=/usr/bin/gdal-config \ + --with-freetype --with-freetype-includes=%{_includedir}/freetype2 \ + --with-gdal=%{_bindir}/gdal-config \ --with-geos \ --with-lapack \ --with-motif \ - --with-mysql --with-mysql-includes=/usr/include/mysql \ + --with-mysql --with-mysql-includes=%{_includedir}/mysql \ --with-netcdf \ --with-nls \ --with-odbc \ --with-openmp \ - --with-postgres --with-postgres-includes=/usr/include/pgsql \ - --with-proj-share=/usr/share/proj \ + --with-postgres --with-postgres-includes=%{_includedir}/pgsql \ + --with-proj-share=%{_datadir}/proj \ --with-pthread \ --with-python \ --with-bzlib \ @@ -173,7 +169,7 @@ --with-wxwidgets # rpmlint: wrong-script-interpreter /usr/bin/env python3 -find . -type f -exec sed -i -e 's:#!/usr/bin/env python3:#!/usr/bin/python3:g' {} + +find . -type f -exec sed -i -e 's:#!%{_bindir}/env python3:#!%{_bindir}/python3:g' {} + %build make prefix=%{grassprefix} PREFIX=%{grassprefix} %{?_smp_mflags} @@ -194,10 +190,10 @@ sed -i s:%{buildroot}::g %{buildroot}%{_bindir}/grass%{shortver} sed -i s:%{buildroot}::g %{buildroot}%{grassdir}/include/Make/Grass.make sed -i s:%{buildroot}::g %{buildroot}%{grassdir}/include/Make/Platform.make -sed -i s:%{buildroot}::g %{buildroot}%{grassdir}/etc/fontcap +sed -i s:%{buildroot}::g %{buildroot}%{grassdir}%{_sysconfdir}/fontcap # Make symlinks in /usr/bin/ -install -d %{buildroot}/usr/bin/ -pushd %{buildroot}/usr/bin/ +install -d %{buildroot}%{_bindir}/ +pushd %{buildroot}%{_bindir}/ ln -fsv grass%{shortver} grass popd @@ -205,10 +201,10 @@ install -d %{buildroot}%{_sysconfdir}/ld.so.conf.d echo %{grasslib} >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/grass-%{version}.conf -mkdir -p %{buildroot}/usr/share/applications -cp %{buildroot}%{grassdir}/share/applications/grass.desktop %{buildroot}/usr/share/applications/grass.desktop -mkdir -p %{buildroot}/usr/share/pixmaps -ln -s %{grassdir}/share/icons/hicolor/192x192/apps/grass.png %{buildroot}/usr/share/pixmaps/grass.png +mkdir -p %{buildroot}%{_datadir}/applications +cp %{buildroot}%{grassdir}/share/applications/grass.desktop %{buildroot}%{_datadir}/applications/grass.desktop +mkdir -p %{buildroot}%{_datadir}/pixmaps +ln -s %{grassdir}/share/icons/hicolor/192x192/apps/grass.png %{buildroot}%{_datadir}/pixmaps/grass.png rm -rf %{buildroot}%{_libdir}/grass%{shortver}/tools/__pycache__ @@ -232,14 +228,14 @@ %{_bindir}/%{name} %{_bindir}/%{name}%{shortver} %{grassdir}/bin/* -%{grassdir}/etc/* +%{grassdir}%{_sysconfdir}/* %{grassdir}/gui/* %{grassdir}/scripts/* %{grassdir}/share/applications/grass.desktop %{grassdir}/share/icons/hicolor/* %{grassdir}/share/metainfo/org.osgeo.grass.appdata.xml -/usr/share/applications/grass.desktop -/usr/share/pixmaps/grass.png +%{_datadir}/applications/grass.desktop +%{_datadir}/pixmaps/grass.png %lang(ar) %{grassdir}/locale/ar/LC_MESSAGES/*.mo %lang(bn) %{grassdir}/locale/bn/LC_MESSAGES/*.mo %lang(cs) %{grassdir}/locale/cs/LC_MESSAGES/*.mo ++++++ grass-7.8.1.md5sum -> grass-7.8.2.md5sum ++++++ --- /work/SRC/openSUSE:Factory/grass/grass-7.8.1.md5sum 2019-12-04 14:20:30.690444783 +0100 +++ /work/SRC/openSUSE:Factory/.grass.new.2738/grass-7.8.2.md5sum 2020-04-29 20:53:31.461154827 +0200 @@ -1 +1 @@ -e8ba9a0780024f8ce25243113ec80c09 grass-7.8.1.tar.gz +352acc82e0651b1f44628c865c89ba82 grass-7.8.2.tar.gz ++++++ grass-7.8.1.tar.gz -> grass-7.8.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/grass/grass-7.8.1.tar.gz /work/SRC/openSUSE:Factory/.grass.new.2738/grass-7.8.2.tar.gz differ: char 5, line 1