From 7a9c098c8a33a6f8168ebcf7d09ade4713679560 Mon Sep 17 00:00:00 2001 From: Markus Date: Oct 05 2020 16:46:45 +0000 Subject: New upstream version GRASS GIS 7.8.4 Fixes BZ#1885210 --- diff --git a/.gitignore b/.gitignore index 3912d55..4a1dbd8 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /grass-7.8.1.tar.gz /grass-7.8.2.tar.gz /grass-7.8.3.tar.gz +/grass-7.8.4.tar.gz diff --git a/grass-config.h b/grass-config.h deleted file mode 100644 index bc59573..0000000 --- a/grass-config.h +++ /dev/null @@ -1,11 +0,0 @@ -#include - -#if __WORDSIZE == 32 -#include "grass/config-32.h" -#else -#if __WORDSIZE == 64 -#include "grass/config-64.h" -#else -#error "Unknown word size" -#endif -#endif diff --git a/grass.spec b/grass.spec index b632895..6726d36 100644 --- a/grass.spec +++ b/grass.spec @@ -2,8 +2,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: grass -Version: 7.8.3 -Release: 10%{?dist} +Version: 7.8.4 +Release: 1%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -23,7 +23,8 @@ Summary: GRASS GIS - Geographic Resources Analysis Support System License: GPLv2+ URL: https://grass.osgeo.org Source0: https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.tar.gz -Source2: %{name}-config.h +# needed? +# Source2: %{name}-config.h Patch1: grass-7.8.0-buildroot.diff @@ -290,7 +291,8 @@ install -p -m 644 %{name}.pc %{buildroot}%{_libdir}/pkgconfig # Create multilib header mv %{buildroot}%{_libdir}/%{name}%{shortver}/include/%{name}/config.h \ %{buildroot}%{_libdir}/%{name}%{shortver}/include/%{name}/config-%{cpuarch}.h -install -p -m 644 %{SOURCE2} %{buildroot}%{_libdir}/%{name}%{shortver}/include/%{name}/config.h +# needed? +# install -p -m 644 %{SOURCE2} %{buildroot}%{_libdir}/%{name}%{shortver}/include/%{name}/config.h # Make man pages available on the system, convert to utf8 and avoid name conflict mkdir -p %{buildroot}%{_mandir}/man1 @@ -382,6 +384,10 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Mon Oct 05 2020 Markus Neteler - 7.8.4-1 +- New upstream version GRASS GIS 7.8.4 +- disabled %{name}-config.h + * Thu Aug 27 2020 Iñaki Úcar - 7.8.3-10 - https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager diff --git a/sources b/sources index 7fc5351..3e41cfa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grass-7.8.3.tar.gz) = 4fa31b869771737b6d11090acfc54dd155c9ac6a259611774a75a74b8ebb59c640dc3417ff8027d91bf3444427525f9c35f32e317677b05809ab3d7aeb03dc84 +SHA512 (grass-7.8.4.tar.gz) = 0a5889c2d054c3f29ba53b8a2d2bd783e077d9b1ad7035ca4e0152258cd4ff165641dca2c696ca03ddb466ad80c1c7c7f9aee535c1fbd82a75c30d7b0a98cdb1