diff --git a/.gitignore b/.gitignore index d37a791..b7eb13b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /grass-7.6.0.tar.gz /grass-7.8.0.tar.gz /grass-7.8.0-buildroot.patch +/grass-7.8.1.tar.gz diff --git a/grass.spec b/grass.spec index d5a23dc..8e38674 100644 --- a/grass.spec +++ b/grass.spec @@ -6,8 +6,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: grass -Version: 7.8.0 -Release: 3%{?dist} +Version: 7.8.1 +Release: 1%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?rhel} @@ -17,7 +17,7 @@ URL: https://grass.osgeo.org Source0: https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.tar.gz Source2: %{name}-config.h -Patch1: grass-7.8.0-buildroot.patch +Patch1: grass-7.8.0-buildroot.patch BuildRequires: bison BuildRequires: blas-devel @@ -50,7 +50,12 @@ BuildRequires: mysql-devel BuildRequires: netcdf-devel %endif BuildRequires: python3 +%if 0%{?rhel} > 6 +# EPEL7 +BuildRequires: python36-numpy +%else BuildRequires: python3-numpy +%endif %if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: postgresql-devel %else @@ -68,11 +73,13 @@ BuildRequires: proj-nad # argparse is included in python2.7+ but not python2.6 BuildRequires: python-argparse %endif +%if 0%{?rhel} > 6 +# EPEL7 +BuildRequires: python36-dateutil +%else BuildRequires: python3-dateutil +%endif BuildRequires: python3-devel -Requires: python3-matplotlib -##? -#Requires: python3-matplotlib-wx %if (0%{?rhel} > 6 || 0%{?fedora}) %if 0%{?rhel} > 6 # EPEL7 @@ -90,9 +97,11 @@ BuildRequires: sqlite-devel BuildRequires: subversion BuildRequires: unixODBC-devel BuildRequires: zlib-devel +BuildRequires: bzip2-devel BuildRequires: libzstd-devel -Requires: libzstd +Requires: bzip2-libs +Requires: libzstd Requires: geos %if (0%{?fedora} >= 30) Requires: proj-datumgrid @@ -102,14 +111,30 @@ Requires: proj-epsg Requires: proj-nad %endif Requires: python3 +%if 0%{?rhel} > 6 +# EPEL7 +Requires: python36-numpy +%else Requires: python3-numpy +%endif +%if 0%{?rhel} > 6 +# EPEL7 +#Requires: python3-matplotlib-wx +%else +Requires: python3-matplotlib +%endif +%if 0%{?rhel} > 6 +# EPEL7 +Requires: python36-dateutil +%else +Requires: python3-dateutil +%endif %if 0%{?rhel} Requires: wxPython %else Requires: python3-wxpython4 %endif - %if "%{_lib}" == "lib" %global cpuarch 32 %else @@ -195,6 +220,7 @@ CXXFLAGS="-std=c++98 ${CFLAGS}" --with-postgres-includes=%{_includedir}/pgsql \ --with-cairo-ldflags=-lfontconfig \ --with-freetype-includes=%{_includedir}/freetype2 \ + --with-bzlib \ --with-zstd \ --with-proj-share=%{_datadir}/proj @@ -328,6 +354,15 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Thu Oct 24 2019 Markus Neteler - 7.8.1 +- new upstream version GRASS GIS 7.8.1 + +* Thu Oct 24 2019 Markus Neteler - 7.8.0-5 +- fix EPEL7 support + +* Mon Sep 23 2019 Markus Metz - 7.8.0-4 +- enable bzip2 compression + * Fri Sep 20 2019 Markus Neteler - 7.8.0-3 - added missing proj-datumgrid and proj-datumgrid-world for >= F30 - fix create symlink to unversioned name diff --git a/sources b/sources index 154a591..65b5a23 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (grass-7.8.0.tar.gz) = 2add6a2f5af2931419a9103b46769c11a727ef4ce10f2977171b80bab038371fb5157294d045ccb57ce4d232a47c15b305912486fd3f7ab4a12eded224c06800 -SHA512 (grass-7.8.0-buildroot.patch) = da860d77ec844848c12fb3dedbf27beb244fc9058aea7eb57ba51ab491c8a9633a345facf42057682141315022c995af5462d9d540e6b860cf551dde86b11fa8 +SHA512 (grass-7.8.1.tar.gz) = 67093dc9648c8aaafb51344de4de2c0cc2913d0820021f1e7422710ba03dad51418b84a031c1eace254c88b72a1e0fb2372d2c90fbfc4b01281c2dd0d8a1013e