Compare commits
14 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
c30e9078c9 | ||
|
|
f2ab0376c3 | ||
|
ab662ae870 | ||
|
|
cdd4c3eb77 | ||
|
0bfda47598 | ||
|
|
a121d65a38 | ||
|
ec4881ad65 | ||
|
870f7698de | ||
|
|
04e8505231 | ||
|
|
0a9044b915 | ||
|
b92a8809b1 | ||
|
deb2d9f2c7 | ||
|
ec44880276 | ||
|
47affae20b |
9 changed files with 315 additions and 387 deletions
15
.gitignore
vendored
15
.gitignore
vendored
|
|
@ -13,18 +13,3 @@
|
|||
/grass-7.8.1.tar.gz
|
||||
/grass-7.8.2.tar.gz
|
||||
/grass-7.8.3.tar.gz
|
||||
/grass-7.8.4.tar.gz
|
||||
/grass-7.8.5.tar.gz
|
||||
/grass-7.8.6.tar.gz
|
||||
/grass-8.0.0.tar.gz
|
||||
/grass-8.0.1.tar.gz
|
||||
/grass-8.0.2.tar.gz
|
||||
/grass-8.2.0.tar.gz
|
||||
/grass-8.2.1.tar.gz
|
||||
/grass-8.3.0.tar.gz
|
||||
/grass-.tar.gz
|
||||
/grass-8.3.1.tar.gz
|
||||
/grass-8.3.2.tar.gz
|
||||
/grass-8.4.0.tar.gz
|
||||
/grass-8.4.1.tar.gz
|
||||
/grass-8.4.2.tar.gz
|
||||
|
|
|
|||
3
.rpmlint
Normal file
3
.rpmlint
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
from Config import *
|
||||
addFilter("spelling-error .* (runtime|spatial)");
|
||||
addFilter("name-repeased-in-summary .* GRASS");
|
||||
23
grass-7.8.0-buildroot.diff
Normal file
23
grass-7.8.0-buildroot.diff
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
diff -up grass-7.8.0/include/Make/Install.make.sopwith grass-7.8.0/include/Make/Install.make
|
||||
--- grass-7.8.0/include/Make/Install.make.sopwith 2019-09-13 15:07:19.127928851 -0400
|
||||
+++ grass-7.8.0/include/Make/Install.make 2019-09-13 15:25:55.583419717 -0400
|
||||
@@ -91,6 +91,10 @@ else
|
||||
STARTUP = $(UNIX_BIN)/$(GRASS_NAME)
|
||||
endif
|
||||
|
||||
+ifndef GISBASE_RUNTIME
|
||||
+GISBASE_RUNTIME=$(INST_DIR)
|
||||
+endif
|
||||
+
|
||||
FONTCAP = etc/fontcap
|
||||
TMPGISRC = demolocation/.grassrc$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)
|
||||
PLATMAKE = include/Make/Platform.make
|
||||
@@ -125,7 +129,7 @@ $(INST_DIR) $(UNIX_BIN):
|
||||
$(MAKE_DIR_CMD) $@
|
||||
|
||||
$(STARTUP): $(ARCH_DISTDIR)/$(GRASS_NAME).tmp
|
||||
- sed -e 's#'@GISBASE@'#'$(INST_DIR)'#g' \
|
||||
+ sed -e 's#'@GISBASE@'#'$(GISBASE_RUNTIME)'#g' \
|
||||
-e 's#'@LD_LIBRARY_PATH_VAR@'#'$(LD_LIBRARY_PATH_VAR)'#g' \
|
||||
-e 's#'@CONFIG_PROJSHARE@'#'$(PROJSHARE)'#g' \
|
||||
$< > $@
|
||||
11
grass-config.h
Normal file
11
grass-config.h
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
#include <bits/wordsize.h>
|
||||
|
||||
#if __WORDSIZE == 32
|
||||
#include "grass/config-32.h"
|
||||
#else
|
||||
#if __WORDSIZE == 64
|
||||
#include "grass/config-64.h"
|
||||
#else
|
||||
#error "Unknown word size"
|
||||
#endif
|
||||
#endif
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
diff --git a/grass.pc.in b/grass.pc.in
|
||||
index 94ca57b65..aec77d095 100644
|
||||
--- a/grass.pc.in
|
||||
+++ b/grass.pc.in
|
||||
@@ -2,13 +2,13 @@
|
||||
#
|
||||
# See also: grass --config
|
||||
|
||||
-prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
|
||||
-exec_prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
|
||||
-libdir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib
|
||||
-includedir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include
|
||||
+prefix=@libdir@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
|
||||
+exec_prefix=@libdir@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
|
||||
+libdir=@libdir@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib
|
||||
+includedir=@libdir@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include
|
||||
|
||||
Name: GRASS
|
||||
Description: GRASS GIS
|
||||
Version: @GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
|
||||
-Libs: -L@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_raster -lgrass_vector -lgrass_dbmibase -lgrass_dbmiclient -lm -lz
|
||||
-Cflags: -I@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include
|
||||
+Libs: -L@libdir@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_raster -lgrass_vector -lgrass_dbmibase -lgrass_dbmiclient -lm -lz
|
||||
+Cflags: -I@libdir@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include
|
||||
491
grass.spec
491
grass.spec
|
|
@ -1,15 +1,15 @@
|
|||
%global shortver 84
|
||||
# This package depends on automagic byte compilation
|
||||
# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2
|
||||
%global _python_bytecompile_extra 1
|
||||
|
||||
%global shortver 78
|
||||
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
|
||||
|
||||
Name: grass
|
||||
Version: 8.4.2
|
||||
Release: 3%{?dist}
|
||||
Version: 7.8.3
|
||||
Release: 5%{?dist}
|
||||
Summary: GRASS GIS - Geographic Resources Analysis Support System
|
||||
|
||||
%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
|
||||
%bcond_without flexiblas
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} >= 7
|
||||
%define __python %{__python3}
|
||||
%global python3_version_nodots 36
|
||||
|
|
@ -20,57 +20,69 @@ Summary: GRASS GIS - Geographic Resources Analysis Support System
|
|||
# "%%bcond_without" means "ENABLE by default and create a --without option"
|
||||
%bcond_without python3
|
||||
|
||||
# GRASS GIS addon reuses the compiler flags originating from rpmbuild environment,
|
||||
# hence disabling package-notes plugin
|
||||
%undefine _package_note_file
|
||||
|
||||
License: GPL-2.0-or-later
|
||||
License: GPLv2+
|
||||
URL: https://grass.osgeo.org
|
||||
Source0: https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.tar.gz
|
||||
Source2: %{name}-config.h
|
||||
|
||||
# fix pkgconfig file
|
||||
Patch 0: grass-pkgconfig.patch
|
||||
|
||||
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
|
||||
ExcludeArch: %{ix86}
|
||||
Patch1: grass-7.8.0-buildroot.diff
|
||||
|
||||
BuildRequires: bison
|
||||
%if %{with flexiblas}
|
||||
BuildRequires: flexiblas-devel
|
||||
%else
|
||||
BuildRequires: blas-devel, lapack-devel
|
||||
%endif
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: blas-devel
|
||||
BuildRequires: cairo-devel
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: fftw-devel
|
||||
BuildRequires: flex
|
||||
%if (0%{?rhel} > 6 || 0%{?fedora})
|
||||
BuildRequires: freetype-devel
|
||||
BuildRequires: gcc-c++
|
||||
%endif
|
||||
BuildRequires: gdal-devel
|
||||
BuildRequires: geos-devel
|
||||
BuildRequires: gettext
|
||||
BuildRequires: laszip-devel
|
||||
BuildRequires: lapack-devel
|
||||
%if (0%{?rhel} > 6 || 0%{?fedora})
|
||||
BuildRequires: libappstream-glib
|
||||
%endif
|
||||
BuildRequires: libpng-devel
|
||||
%if 0%{?rhel} && 0%{?rhel} == 7
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: libXmu-devel
|
||||
BuildRequires: mesa-libGL-devel
|
||||
BuildRequires: mesa-libGLU-devel
|
||||
%if (0%{?rhel} > 7 || 0%{?fedora})
|
||||
BuildRequires: mariadb-connector-c-devel openssl-devel
|
||||
%else
|
||||
BuildRequires: mysql-devel
|
||||
%endif
|
||||
%if (0%{?rhel} > 6 || 0%{?fedora})
|
||||
BuildRequires: netcdf-devel
|
||||
%endif
|
||||
BuildRequires: python3
|
||||
%if 0%{?rhel} == 7
|
||||
# EPEL7
|
||||
BuildRequires: python%{python3_version_nodots}-numpy
|
||||
%else
|
||||
BuildRequires: python3-numpy
|
||||
%endif
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
BuildRequires: postgresql-devel
|
||||
%else
|
||||
BuildRequires: libpq-devel
|
||||
%endif
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: libXmu-devel
|
||||
BuildRequires: libzstd-devel
|
||||
BuildRequires: make
|
||||
BuildRequires: mariadb-connector-c-devel openssl-devel
|
||||
BuildRequires: mesa-libGL-devel
|
||||
BuildRequires: mesa-libGLU-devel
|
||||
BuildRequires: netcdf-devel
|
||||
BuildRequires: PDAL
|
||||
BuildRequires: PDAL-devel
|
||||
BuildRequires: PDAL-libs
|
||||
BuildRequires: proj-devel
|
||||
BuildRequires: python3
|
||||
%if (0%{?rhel} > 7 || 0%{?fedora} >= 30)
|
||||
BuildRequires: proj-datumgrid
|
||||
%else
|
||||
BuildRequires: proj-epsg
|
||||
BuildRequires: proj-nad
|
||||
%endif
|
||||
%if 0%{?fedora} >= 30
|
||||
BuildRequires: proj-datumgrid-world
|
||||
%endif
|
||||
%if (0%{?rhel} <= 6 && !0%{?fedora})
|
||||
# argparse is included in python2.7+ but not python2.6
|
||||
BuildRequires: python-argparse
|
||||
%endif
|
||||
%if 0%{?rhel} == 7
|
||||
# EPEL7
|
||||
BuildRequires: python%{python3_version_nodots}-dateutil
|
||||
|
|
@ -78,44 +90,63 @@ BuildRequires: python%{python3_version_nodots}-dateutil
|
|||
BuildRequires: python3-dateutil
|
||||
%endif
|
||||
BuildRequires: python3-devel
|
||||
%if 0%{?rhel} == 7
|
||||
# EPEL7
|
||||
BuildRequires: python%{python3_version_nodots}-numpy
|
||||
%else
|
||||
BuildRequires: python3-numpy
|
||||
%endif
|
||||
%if (0%{?rhel} > 6 || 0%{?fedora})
|
||||
BuildRequires: python3-pillow
|
||||
%else
|
||||
# EPEL6
|
||||
BuildRequires: python-imaging
|
||||
%endif
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: sqlite-devel
|
||||
BuildRequires: subversion
|
||||
BuildRequires: unixODBC-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: libzstd-devel
|
||||
|
||||
Requires: bzip2-libs
|
||||
Requires: geos
|
||||
Requires: libzstd
|
||||
Requires: PDAL
|
||||
Requires: PDAL-libs
|
||||
Requires: python3
|
||||
%if 0%{?rhel} == 7
|
||||
# EPEL7
|
||||
Requires: python%{python3_version_nodots}-dateutil
|
||||
Requires: geos
|
||||
%if (0%{?rhel} > 7 || 0%{?fedora} >= 30)
|
||||
Requires: proj-datumgrid
|
||||
%else
|
||||
Requires: python3-dateutil
|
||||
Requires: proj-epsg
|
||||
Requires: proj-nad
|
||||
%endif
|
||||
%if 0%{?fedora} >= 30
|
||||
Requires: proj-datumgrid-world
|
||||
%endif
|
||||
Requires: python3
|
||||
%if 0%{?rhel} == 7
|
||||
# EPEL7
|
||||
Requires: python%{python3_version_nodots}-numpy
|
||||
%else
|
||||
Requires: python3-numpy
|
||||
%endif
|
||||
Requires: python3-wxpython4
|
||||
%if 0%{?rhel} > 6
|
||||
# EPEL7/EPEL8
|
||||
#Requires: python3-matplotlib-wx
|
||||
%else
|
||||
Requires: python3-matplotlib
|
||||
%endif
|
||||
%if 0%{?rhel} == 7
|
||||
# EPEL7
|
||||
Requires: python%{python3_version_nodots}-dateutil
|
||||
%else
|
||||
Requires: python3-dateutil
|
||||
%endif
|
||||
%if 0%{?rhel} && 0%{?rhel} < 7
|
||||
Requires: wxPython
|
||||
%else
|
||||
Requires: python3-wxpython4
|
||||
%endif
|
||||
|
||||
%if "%{_lib}" == "lib"
|
||||
%global cpuarch 32
|
||||
%else
|
||||
%global cpuarch 64
|
||||
%endif
|
||||
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description
|
||||
|
|
@ -148,42 +179,47 @@ GRASS GIS development headers
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch 0 -p1 -b.libdir
|
||||
|
||||
%patch1 -p1
|
||||
|
||||
# Correct mysql_config query
|
||||
sed -i -e 's/--libmysqld-libs/--libs/g' configure
|
||||
|
||||
%if %{with flexiblas}
|
||||
sed -i -e 's/-lblas/-lflexiblas/g' -e 's/-llapack/-lflexiblas/g' configure
|
||||
%endif
|
||||
|
||||
# Fixup shebangs
|
||||
find -name \*.pl | xargs sed -i -e 's,#!/usr/bin/env perl,#!%{__perl},'
|
||||
|
||||
%build
|
||||
# Package is not ready for -Werror=format-security or the C++11 standard
|
||||
CFLAGS="$(echo ${RPM_OPT_FLAGS} | sed -e 's/ -Werror=format-security//')"
|
||||
CXXFLAGS="-std=c++98 ${CFLAGS}"
|
||||
%configure \
|
||||
--prefix=%{_libdir} \
|
||||
--with-blas \
|
||||
%if %{with flexiblas}
|
||||
--with-blas-includes=%{_includedir}/flexiblas \
|
||||
%endif
|
||||
--with-bzlib \
|
||||
--with-cairo \
|
||||
--with-cairo-ldflags=-lfontconfig \
|
||||
--with-cxx \
|
||||
--with-fftw \
|
||||
--with-freetype \
|
||||
--with-freetype-includes=%{_includedir}/freetype2 \
|
||||
--with-gdal=%{_bindir}/gdal-config \
|
||||
--with-geos=%{_bindir}/geos-config \
|
||||
--with-lapack \
|
||||
%if %{with flexiblas}
|
||||
--with-lapack-includes=%{_includedir}/flexiblas \
|
||||
%endif
|
||||
--with-tiff \
|
||||
--with-png \
|
||||
--with-postgres \
|
||||
%if 0%{?rhel} > 7
|
||||
--with-mysql=no \
|
||||
--with-mysql=no \
|
||||
%else
|
||||
--with-mysql \
|
||||
%endif
|
||||
--with-opengl \
|
||||
--with-odbc \
|
||||
--with-fftw \
|
||||
--with-blas \
|
||||
--with-lapack \
|
||||
--with-cairo \
|
||||
%if (0%{?rhel} > 6 || 0%{?fedora})
|
||||
--with-freetype \
|
||||
%endif
|
||||
--with-nls \
|
||||
--with-readline \
|
||||
--with-regex \
|
||||
--with-openmp \
|
||||
--with-gdal=%{_bindir}/gdal-config \
|
||||
--with-wxwidgets=%{_bindir}/wx-config \
|
||||
--with-geos=%{_bindir}/geos-config \
|
||||
%if (0%{?rhel} > 6 || 0%{?fedora})
|
||||
--with-netcdf=%{_bindir}/nc-config \
|
||||
%endif
|
||||
--with-mysql-includes=%{_includedir}/mysql \
|
||||
%if (0%{?fedora} >= 27)
|
||||
|
|
@ -191,25 +227,12 @@ find -name \*.pl | xargs sed -i -e 's,#!/usr/bin/env perl,#!%{__perl},'
|
|||
%else
|
||||
--with-mysql-libs=%{_libdir}/mysql \
|
||||
%endif
|
||||
--with-netcdf=%{_bindir}/nc-config \
|
||||
--with-nls \
|
||||
--with-odbc \
|
||||
--with-opengl \
|
||||
--with-openmp \
|
||||
--with-pdal \
|
||||
--with-png \
|
||||
--with-postgres \
|
||||
--with-postgres-includes=%{_includedir}/pgsql \
|
||||
--with-proj-share=%{_datadir}/proj \
|
||||
--with-readline \
|
||||
--with-regex \
|
||||
--with-tiff \
|
||||
--with-wxwidgets=%{_bindir}/wx-config \
|
||||
--with-zstd
|
||||
|
||||
|
||||
# .package_note hack for RHBZ #2084342 and RHBZ #2102895
|
||||
sed -i "s+ -Wl,-dT,${RPM_BUILD_DIR}/grass-%{version}/.package_note-grass-%{version}-%{release}.%{_arch}.ld++g" include/Make/Platform.make
|
||||
--with-cairo-ldflags=-lfontconfig \
|
||||
--with-freetype-includes=%{_includedir}/freetype2 \
|
||||
--with-bzlib \
|
||||
--with-zstd \
|
||||
--with-proj-share=%{_datadir}/proj
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
|
@ -217,16 +240,30 @@ make %{?_smp_mflags}
|
|||
# this is not FHS compliant: hide grass-%%{version} in %%{libdir}
|
||||
%install
|
||||
%make_install \
|
||||
DESTDIR=%{buildroot} \
|
||||
prefix=%{_libdir} \
|
||||
UNIX_BIN=%{_bindir} \
|
||||
DESTDIR=%{buildroot}%{_libdir} \
|
||||
prefix=%{buildroot}%{_libdir} \
|
||||
UNIX_BIN=%{buildroot}%{_bindir} \
|
||||
GISBASE_RUNTIME=%{_libdir}/%{name}%{shortver}
|
||||
|
||||
# libraries and headers are in GISBASE = %%{_libdir}/%%{name}
|
||||
# keep them in GISBASE
|
||||
|
||||
# fix paths:
|
||||
# Change GISBASE in startup script
|
||||
for I in %{buildroot}%{_bindir}/%{name}%{shortver} \
|
||||
%{buildroot}%{_libdir}/%{name}%{shortver}/include/Make/Platform.make \
|
||||
%{buildroot}%{_libdir}/%{name}%{shortver}/include/Make/Grass.make \
|
||||
%{buildroot}%{_libdir}/%{name}%{shortver}/demolocation/.grassrc%{shortver} \
|
||||
%{buildroot}%{_libdir}/%{name}%{shortver}/etc/fontcap; do
|
||||
sed -i \
|
||||
-e 's|%{buildroot}%{_libdir}/%{name}-%{version}|%{_libdir}/%{name}%{shortver}|g' \
|
||||
-e 's|%{buildroot}%{_libdir}/%{name}%{shortver}|%{_libdir}/%{name}%{shortver}|g' \
|
||||
-e 's|%{buildroot}%{_bindir}|%{_bindir}|g' \
|
||||
$I
|
||||
done
|
||||
|
||||
# fix paths in grass.pc
|
||||
sed -i -e 's|%{_libdir}/%{name}-%{version}|%{_libdir}/%{name}%{shortver}|g' \
|
||||
sed -i -e 's|%{_prefix}/%{name}-%{version}|%{_libdir}/%{name}%{shortver}|g' \
|
||||
%{name}.pc
|
||||
|
||||
mkdir -p %{buildroot}%{_libdir}/pkgconfig
|
||||
|
|
@ -235,18 +272,7 @@ 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
|
||||
echo '#include <bits/wordsize.h>
|
||||
|
||||
#if __WORDSIZE == 32
|
||||
#include "grass/config-32.h"
|
||||
#else
|
||||
#if __WORDSIZE == 64
|
||||
#include "grass/config-64.h"
|
||||
#else
|
||||
#error "Unknown word size"
|
||||
#endif
|
||||
#endif' > %{buildroot}%{_libdir}/%{name}%{shortver}/include/%{name}/config.h
|
||||
chmod 644 %{buildroot}%{_libdir}/%{name}%{shortver}/include/%{name}/config.h
|
||||
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
|
||||
|
|
@ -255,6 +281,9 @@ do
|
|||
iconv -f iso8859-1 -t utf8 $man > %{buildroot}%{_mandir}/man1/$(basename $man)"%{name}"
|
||||
done
|
||||
|
||||
# create symlink to unversioned name
|
||||
ln -s %{_bindir}/%{name}%{shortver} %{buildroot}%{_bindir}/%{name}
|
||||
|
||||
# symlink docs from GISBASE to standard system location
|
||||
mkdir -p %{buildroot}%{_docdir}
|
||||
# append shortver to destination since man pages are unversioned
|
||||
|
|
@ -269,7 +298,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/org.osge
|
|||
#rm -rf %%{buildroot}%%{_prefix}/%%{name}-%%{version}
|
||||
|
||||
# Finally move entire tree to shortver subdir
|
||||
#mv %%{buildroot}%%{_libdir}/%%{name}-%%{version} %%{buildroot}%%{_libdir}/%%{name}%%{shortver}
|
||||
#mv %{buildroot}%{_libdir}/%{name}-%{version} %{buildroot}%{_libdir}/%{name}%{shortver}
|
||||
|
||||
# rpm macro for version checking (not from buildroot!)
|
||||
mkdir -p ${RPM_BUILD_ROOT}%{macrosdir}
|
||||
|
|
@ -283,7 +312,7 @@ cat > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf<<EOF
|
|||
%{_libdir}/%{name}%{shortver}/lib
|
||||
EOF
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} == 7
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
%post
|
||||
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
|
|
@ -316,9 +345,10 @@ fi
|
|||
%{_docdir}/%{name}%{shortver}
|
||||
|
||||
%files libs
|
||||
%license AUTHORS COPYING GPL.TXT
|
||||
%license AUTHORS COPYING GPL.TXT CHANGES
|
||||
%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
|
||||
%{_libdir}/%{name}%{shortver}/lib/*.so
|
||||
%{_libdir}/%{name}%{shortver}/lib/*.a
|
||||
%dir %{_libdir}/%{name}%{shortver}/driver
|
||||
%dir %{_libdir}/%{name}%{shortver}/driver/db
|
||||
%{_libdir}/%{name}%{shortver}/driver/db/*
|
||||
|
|
@ -327,246 +357,13 @@ fi
|
|||
%{_libdir}/%{name}%{shortver}/gui
|
||||
|
||||
%files devel
|
||||
%doc TODO doc/* CONTRIBUTING.md
|
||||
%doc TODO doc/* SUBMITTING
|
||||
%{macrosdir}/macros.%{name}
|
||||
%{_libdir}/pkgconfig/*
|
||||
%dir %{_libdir}/%{name}%{shortver}/lib
|
||||
%{_libdir}/%{name}%{shortver}/include
|
||||
|
||||
%changelog
|
||||
* Wed Jan 14 2026 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 8.4.2-3
|
||||
- Drop support for i686
|
||||
|
||||
* Sun Nov 23 2025 Sandro Mani <manisandro@gmail.com> - 8.4.2-2
|
||||
- Rebuild (gdal)
|
||||
|
||||
* Sun Nov 23 2025 Markus Neteler <neteler@mundialis.de> - 8.4.2-1
|
||||
- Update to GRASS 8.4.2 (#2416357)
|
||||
|
||||
* Sat Sep 27 2025 Markus Neteler <neteler@mundialis.de> - 8.4.1-8
|
||||
- Rebuilt for F43
|
||||
|
||||
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 8.4.1-7
|
||||
- Rebuilt for Python 3.14.0rc3 bytecode
|
||||
|
||||
* Fri Aug 22 2025 Orion Poplawski <orion@nwra.com> - 8.4.1-6
|
||||
- Rebuild for netcdf 4.9.3 soname bump
|
||||
|
||||
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 8.4.1-5
|
||||
- Rebuilt for Python 3.14.0rc2 bytecode
|
||||
|
||||
* Sun Aug 03 2025 Sandro Mani <manisandro@gmail.com> - 8.4.1-4
|
||||
- Rebuild (PDAL)
|
||||
|
||||
* Wed Jul 30 2025 Sandro Mani <manisandro@gmail.com> - 8.4.1-3
|
||||
- Rebuild (gdal)
|
||||
|
||||
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8.4.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Mon Feb 24 2025 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 8.4.1-1
|
||||
- Update to 8.4.1 (#2347356)
|
||||
|
||||
* Sat Feb 22 2025 Markus Neteler <neteler@mundialis.de> - 8.4.0-7
|
||||
- drop outdated proj-datumgrid condition
|
||||
|
||||
* Mon Feb 10 2025 Markus Neteler <neteler@mundialis.de> - 8.4.0-6
|
||||
- EPEL10: fix proj-datumgrid condition
|
||||
|
||||
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 8.4.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Sat Nov 09 2024 Sandro Mani <manisandro@gmail.com> - 8.4.0-4
|
||||
- Rebuild (gdal)
|
||||
|
||||
* Sat Oct 26 2024 Markus Neteler <neteler@mundialis.de> - 8.4.0-3
|
||||
- Sort requirements and flags (https://github.com/OSGeo/grass/pull/4563/ by Edouard Choinière)
|
||||
|
||||
* Fri Sep 06 2024 Sandro Mani <manisandro@gmail.com> - 8.4.0-2
|
||||
- Rebuild (PDAL)
|
||||
|
||||
* Sun Jul 28 2024 Markus Neteler <neteler@mundialis.de> - 8.4.0-1
|
||||
- Update to 8.4.0
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Tue May 14 2024 Sandro Mani <manisandro@gmail.com> - 8.3.2-3
|
||||
- Rebuild (gdal)
|
||||
|
||||
* Tue Mar 19 2024 Sandro Mani <manisandro@gmail.com> - 8.3.2-2
|
||||
- Rebuild (PDAL)
|
||||
|
||||
* Thu Mar 07 2024 Markus Neteler <neteler@mundialis.de> - 8.3.2-1
|
||||
- Update to 8.3.2 (#2268514)
|
||||
|
||||
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Wed Jan 3 2024 Florian Weimer <fweimer@redhat.com> - 8.3.1-4
|
||||
- Fix C compatibility issue in MySQL port handling
|
||||
|
||||
* Wed Nov 15 2023 Sandro Mani <manisandro@gmail.com> - 8.3.1-3
|
||||
- Rebuild (gdal)
|
||||
|
||||
* Sat Oct 28 2023 Markus Neteler <neteler@mundialis.de> 8.3.1-2
|
||||
- fix obsolete configure parameters
|
||||
|
||||
* Thu Oct 26 2023 Fedora Release Monitoring <release-monitoring@fedoraproject.org> - 8.3.1-1
|
||||
- Update to GRASS GIS 8.3.1 (#2246359)
|
||||
|
||||
* Sat Oct 14 2023 Sandro Mani <manisandro@gmail.com> - 8.3.0-4
|
||||
- Rebuild (PDAL)
|
||||
|
||||
* Sun Aug 06 2023 Alexandre Detiste <alexandre.detiste@gmail.com> - 8.3.0-3
|
||||
- Remove support for RHEL6: Grass is now Python3 only
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sun Jun 25 2023 Markus Neteler <neteler@mundialis.de> 8.3.0-1
|
||||
- New upstream version GRASS GIS 8.3.0
|
||||
|
||||
* Thu May 11 2023 Sandro Mani <manisandro@gmail.com> - 8.2.1-2
|
||||
- Rebuild (gdal)
|
||||
|
||||
* Sat Jan 21 2023 Markus Neteler <neteler@mundialis.de> 8.2.1-1
|
||||
- New upstream version GRASS GIS 8.2.1
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8.2.0-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Mon Jan 16 2023 Markus Neteler <neteler@mundialis.de> 8.2.0-10
|
||||
- modify grass-pdal.patch for alternative C++ fix
|
||||
|
||||
* Sat Jan 14 2023 Sandro Mani <manisandro@gmail.com> - 8.2.0-9
|
||||
- Rebuild (PDAL)
|
||||
|
||||
* Sat Nov 12 2022 Sandro Mani <manisandro@gmail.com> - 8.2.0-8
|
||||
- Rebuild (gdal)
|
||||
|
||||
* Wed Nov 09 2022 Markus Neteler <neteler@mundialis.de> 8.2.0-7
|
||||
- SPDX license tag update
|
||||
|
||||
* Thu Nov 03 2022 Markus Neteler <neteler@mundialis.de> - 8.2.0-6
|
||||
- fix RPM ARCH not defined for GRASS GIS addon installation (RHBZ #2138373)
|
||||
|
||||
* Sat Sep 17 2022 Markus Neteler <neteler@mundialis.de> - 8.2.0-5
|
||||
- fix unexpected keyword argument 'codeset' (Python 3.11) for RHBZ #2126608
|
||||
|
||||
* Mon Aug 08 2022 Markus Neteler <neteler@mundialis.de> - 8.2.0-4
|
||||
- Rebuild for RHBZ #2107826 (PYC magic number has changed)
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 8.2.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Jul 11 2022 Markus Neteler <neteler@mundialis.de> - 8.2.0-2
|
||||
- .package_note hack for RHBZ #2084342 and RHBZ #2102895
|
||||
|
||||
* Sat Jun 04 2022 Markus Neteler <neteler@mundialis.de> - 8.2.0-1
|
||||
- New upstream version GRASS GIS 8.2.0
|
||||
|
||||
* Sat May 21 2022 Sandro Mani <manisandro@gmail.com> - 8.0.2-2
|
||||
- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0
|
||||
|
||||
* Thu May 12 2022 Markus Neteler <neteler@mundialis.de> - 8.0.2-1
|
||||
- New upstream version GRASS GIS 8.0.2
|
||||
|
||||
* Tue Mar 29 2022 Markus Neteler <neteler@mundialis.de> - 8.0.1-3
|
||||
- Rebuild for pdal-2.4.0
|
||||
|
||||
* Thu Mar 10 2022 Sandro Mani <manisandro@gmail.com> - 8.0.1-2
|
||||
- Rebuild for proj-9.0.0
|
||||
|
||||
* Thu Feb 24 2022 Markus Neteler <neteler@mundialis.de> - 8.0.1-1
|
||||
- New upstream version GRASS GIS 8.0.1
|
||||
|
||||
* Fri Jan 28 2022 Markus Neteler <neteler@mundialis.de> - 8.0.0-1
|
||||
- New upstream version GRASS GIS 8.0.0
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.6-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Nov 11 2021 Sandro Mani <manisandro@gmail.com> - 7.8.6-3
|
||||
- Rebuild (gdal)
|
||||
|
||||
* Sun Nov 07 2021 Björn Esser <besser82@fedoraproject.org> - 7.8.6-2
|
||||
- Add patch to fix installation path in pkgconfig file
|
||||
|
||||
* Tue Nov 02 2021 Markus Neteler <neteler@mundialis.de> - 7.8.6-1
|
||||
- New upstream version GRASS GIS 7.8.6
|
||||
|
||||
* Thu Oct 21 2021 Sandro Mani <manisandro@gmail.com> - 7.8.5-11
|
||||
- Rebuild (geos)
|
||||
|
||||
* Tue Aug 10 2021 Orion Poplawski <orion@nwra.com> - 7.8.5-10
|
||||
- Rebuild for netcdf 4.8.0
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.5-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Mon Jun 21 2021 Markus Neteler <neteler@mundialis.de> - 7.8.5-8
|
||||
- fix ctypes for Python 3.10 (RHBZ #1973621)
|
||||
|
||||
* Fri May 07 2021 Sandro Mani <manisandro@gmail.com> - 7.8.5-7
|
||||
- Rebuild (gdal)
|
||||
|
||||
* Wed Mar 24 2021 Sandro Mani <manisandro@gmail.com> - 7.8.5-6
|
||||
- Bump
|
||||
|
||||
* Sun Mar 07 2021 Sandro Mani <manisandro@gmail.com> - 7.8.5-5
|
||||
- Rebuild (proj)
|
||||
|
||||
* Sat Feb 13 2021 Sandro Mani <manisandro@gmail.com> - 7.8.5-4
|
||||
- Rebuild (geos)
|
||||
|
||||
* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 7.8.5-3
|
||||
- rebuild for libpq ABI fix rhbz#1908268
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Dec 22 2020 Markus Neteler <neteler@mundialis.de> - 7.8.5-1
|
||||
- New upstream version GRASS GIS 7.8.5
|
||||
|
||||
* Tue Nov 24 2020 Markus Neteler <neteler@mundialis.de> - 7.8.4-6
|
||||
- Clean up proj-datumgrid requires < f34+
|
||||
|
||||
* Fri Nov 20 2020 Sandro Mani <manisandro@gmail.com> - 7.8.4-5
|
||||
- Drop proj-datumgrid requires on f34+
|
||||
|
||||
* Fri Nov 6 2020 Sandro Mani <manisandro@gmail.com> - 7.8.4-4
|
||||
- Rebuild (proj, gdal)
|
||||
|
||||
* Wed Nov 4 2020 Sandro Mani <manisandro@gmail.com> - 7.8.4-3
|
||||
- Rebuild (PDAL)
|
||||
|
||||
* Sat Oct 17 2020 Markus Neteler <neteler@mundialis.de> - 7.8.4-2
|
||||
- reinstate %%{name}-config.h (RHBZ #1889035) as being needed for QGIS
|
||||
|
||||
* Mon Oct 05 2020 Markus Neteler <neteler@mundialis.de> - 7.8.4-1
|
||||
- New upstream version GRASS GIS 7.8.4
|
||||
- disabled %%{name}-config.h
|
||||
|
||||
* Thu Aug 27 2020 Iñaki Úcar <iucar@fedoraproject.org> - 7.8.3-10
|
||||
- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.3-9
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.3-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jun 26 2020 Markus Neteler <neteler@mundialis.de> - 7.8.3-7
|
||||
- added PDAL support
|
||||
|
||||
* Sun Jun 21 2020 Markus Neteler <neteler@mundialis.de> - 7.8.3-6
|
||||
- disable automagic byte compilation (BZ#1847153)
|
||||
|
||||
* Tue May 26 2020 Markus Neteler <neteler@mundialis.de> - 7.8.3-5
|
||||
- fixed wxPython for F33 (BZ#1836761)
|
||||
|
||||
|
|
|
|||
90
grass72_ctypes_gcc7.diff
Normal file
90
grass72_ctypes_gcc7.diff
Normal file
|
|
@ -0,0 +1,90 @@
|
|||
Index: grass-7.2.1/lib/python/ctypes/ctypesgencore/parser/lextab.py
|
||||
===================================================================
|
||||
--- grass-7.2.1/lib/python/ctypes/ctypesgencore/parser/lextab.py (revision 71218)
|
||||
+++ grass-7.2.1/lib/python/ctypes/ctypesgencore/parser/lextab.py (revision 71219)
|
||||
@@ -1,59 +1,8 @@
|
||||
# lextab.py. This file automatically created by PLY (version 2.2). Don't edit!
|
||||
-_lextokens = {
|
||||
- 'RIGHT_OP': None,
|
||||
- 'RIGHT_ASSIGN': None,
|
||||
- 'DEC_OP': None,
|
||||
- 'PP_MACRO_PARAM': None,
|
||||
- 'DIV_ASSIGN': None,
|
||||
- 'PP_DEFINE': None,
|
||||
- 'PP_END_DEFINE': None,
|
||||
- 'PP_DEFINE_MACRO_NAME': None,
|
||||
- 'HEADER_NAME': None,
|
||||
- 'NEWLINE': None,
|
||||
- 'CHARACTER_CONSTANT': None,
|
||||
- 'PP_STRINGIFY': None,
|
||||
- 'AND_ASSIGN': None,
|
||||
- 'PTR_OP': None,
|
||||
- 'ELLIPSIS': None,
|
||||
- 'IDENTIFIER': None,
|
||||
- 'ADD_ASSIGN': None,
|
||||
- 'PERIOD': None,
|
||||
- 'AND_OP': None,
|
||||
- 'OTHER': None,
|
||||
- 'LPAREN': None,
|
||||
- 'LEFT_OP': None,
|
||||
- 'LE_OP': None,
|
||||
- 'OR_OP': None,
|
||||
- 'SUB_ASSIGN': None,
|
||||
- 'MOD_ASSIGN': None,
|
||||
- 'STRING_LITERAL': None,
|
||||
- 'PP_IDENTIFIER_PASTE': None,
|
||||
- 'PP_NUMBER': None,
|
||||
- 'PP_DEFINE_NAME': None,
|
||||
- 'XOR_ASSIGN': None,
|
||||
- 'OR_ASSIGN': None,
|
||||
- 'GE_OP': None,
|
||||
- 'MUL_ASSIGN': None,
|
||||
- 'LEFT_ASSIGN': None,
|
||||
- 'INC_OP': None,
|
||||
- 'NE_OP': None,
|
||||
- 'EQ_OP': None}
|
||||
-_lexreflags = 0
|
||||
-_lexliterals = ''
|
||||
+_lextokens = {'RIGHT_OP': None, 'RIGHT_ASSIGN': None, 'DEC_OP': None, 'PP_MACRO_PARAM': None, 'DIV_ASSIGN': None, 'PP_DEFINE': None, 'PP_END_DEFINE': None, 'PP_DEFINE_MACRO_NAME': None, 'HEADER_NAME': None, 'NEWLINE': None, 'CHARACTER_CONSTANT': None, 'PP_STRINGIFY': None, 'AND_ASSIGN': None, 'PTR_OP': None, 'ELLIPSIS': None, 'IDENTIFIER': None, 'ADD_ASSIGN': None, 'PERIOD': None, 'AND_OP': None, 'OTHER': None, 'LPAREN': None, 'LEFT_OP': None, 'LE_OP': None, 'OR_OP': None, 'SUB_ASSIGN': None, 'MOD_ASSIGN': None, 'STRING_LITERAL': None, 'PP_IDENTIFIER_PASTE': None, 'PP_NUMBER': None, 'PP_DEFINE_NAME': None, 'XOR_ASSIGN': None, 'OR_ASSIGN': None, 'GE_OP': None, 'MUL_ASSIGN': None, 'LEFT_ASSIGN': None, 'INC_OP': None, 'NE_OP': None, 'EQ_OP': None}
|
||||
+_lexreflags = 0
|
||||
+_lexliterals = ''
|
||||
_lexstateinfo = {'INITIAL': 'inclusive', 'DEFINE': 'exclusive'}
|
||||
-_lexstatere = {
|
||||
- 'INITIAL': [
|
||||
- ('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|\\*=|\\^=|<<=|>>=|\\|=|\\+=|>=|>>|<<|<=|<:|%=|:>|<%|!=|\\)|\\+|\\*|\\.|\\?|==|&=|&&|\\[|\\^|--|/=|%>|-=|->|\\||!|%|&|-|,|/|;|:|=|>|]|<|{|}|~))', [
|
||||
- None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_INITIAL_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [
|
||||
- None, ('t_INITIAL_identifier', 'INITIAL_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>[FflL]?)(?!\\w))', [
|
||||
- None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [
|
||||
- None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_INITIAL_newline>\\n)|(?P<t_INITIAL_pp_define>\\#define)', [
|
||||
- None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_INITIAL_newline', 'INITIAL_newline'), ('t_INITIAL_pp_define', 'INITIAL_pp_define')])], 'DEFINE': [
|
||||
- ('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|\\*=|\\^=|<<=|>>=|\\|=|\\+=|>=|>>|<<|<=|<:|%=|:>|<%|!=|\\)|\\+|\\*|\\.|\\?|==|&=|&&|\\[|\\^|--|/=|%>|-=|->|\\||!|%|&|-|,|/|;|:|=|>|]|<|{|}|~))', [
|
||||
- None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_DEFINE_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [
|
||||
- None, ('t_DEFINE_identifier', 'DEFINE_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>[FflL]?)(?!\\w))', [
|
||||
- None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [
|
||||
- None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_DEFINE_newline>\\n)|(?P<t_DEFINE_pp_param_op>(\\#\\#)|(\\#))', [
|
||||
- None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_DEFINE_newline', 'DEFINE_newline'), ('t_DEFINE_pp_param_op', 'DEFINE_pp_param_op')])]}
|
||||
+_lexstatere = {'INITIAL': [('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|>>=|\\|=|\\^=|<<=|\\*=|\\+=|>=|>>|%=|:>|%>|!=|\\*|\\.|==|\\^|--|-=|->|\\||<<|<=|<:|<%|\\)|\\+|\\?|&=|&&|\\[|/=|&|,|:|<|>|~|!|%|-|/|;|=|]|{|}))', [None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_INITIAL_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [None, ('t_INITIAL_identifier', 'INITIAL_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)?)(?!\\w))', [None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_INITIAL_newline>\\n)|(?P<t_INITIAL_pp_define>\\#define)', [None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_INITIAL_newline', 'INITIAL_newline'), ('t_INITIAL_pp_define', 'INITIAL_pp_define')])], 'DEFINE': [('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|>>=|\\|=|\\^=|<<=|\\*=|\\+=|>=|>>|%=|:>|%>|!=|\\*|\\.|==|\\^|--|-=|->|\\||<<|<=|<:|<%|\\)|\\+|\\?|&=|&&|\\[|/=|&|,|:|<|>|~|!|%|-|/|;|=|]|{|}))', [None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_DEFINE_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [None, ('t_DEFINE_identifier', 'DEFINE_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)?)(?!\\w))', [None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_DEFINE_newline>\\n)|(?P<t_DEFINE_pp_param_op>(\\#\\#)|(\\#))', [None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_DEFINE_newline', 'DEFINE_newline'), ('t_DEFINE_pp_param_op', 'DEFINE_pp_param_op')])]}
|
||||
_lexstateignore = {'INITIAL': ' \t\x0b\x0c\r', 'DEFINE': ' \t\x0b\x0c\r'}
|
||||
_lexstateerrorf = {'INITIAL': 't_INITIAL_error', 'DEFINE': 't_DEFINE_error'}
|
||||
Index: grass-7.2.1/lib/python/ctypes/ctypesgencore/parser/pplexer.py
|
||||
===================================================================
|
||||
--- grass-7.2.1/lib/python/ctypes/ctypesgencore/parser/pplexer.py (revision 71218)
|
||||
+++ grass-7.2.1/lib/python/ctypes/ctypesgencore/parser/pplexer.py (revision 71219)
|
||||
@@ -53,5 +53,5 @@
|
||||
'H': '[a-fA-F0-9]',
|
||||
'E': '[Ee][+-]?\s*{D}+',
|
||||
- 'FS': '[FflL]',
|
||||
+ 'FS': '([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)',
|
||||
'IS': '[uUlL]*',
|
||||
}
|
||||
@@ -227,8 +227,8 @@
|
||||
suf = m.group("suf")
|
||||
|
||||
- if dp or exp or (suf and suf in ("Ff")):
|
||||
+ if dp or exp or (suf and suf not in ("Ll")):
|
||||
s = m.group(0)
|
||||
if suf:
|
||||
- s = s[:-1]
|
||||
+ s = s[:-len(suf)]
|
||||
# Attach a prefix so the parser can figure out if should become an
|
||||
# integer, float, or long
|
||||
43
grass72_rpc_removal.diff
Normal file
43
grass72_rpc_removal.diff
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
Index: grass-7.2.2/lib/raster/get_row.c
|
||||
===================================================================
|
||||
--- grass-7.2.2/lib/raster/get_row.c (revision 71935)
|
||||
+++ grass-7.2.2/lib/raster/get_row.c (revision 71944)
|
||||
@@ -15,6 +15,4 @@
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
-
|
||||
-#include <rpc/types.h> /* need this for sgi */
|
||||
|
||||
#include <grass/config.h>
|
||||
Index: grass-7.2.2/lib/raster/open.c
|
||||
===================================================================
|
||||
--- grass-7.2.2/lib/raster/open.c (revision 71935)
|
||||
+++ grass-7.2.2/lib/raster/open.c (revision 71944)
|
||||
@@ -13,6 +13,4 @@
|
||||
*/
|
||||
|
||||
-#include <rpc/types.h>
|
||||
-#include <rpc/xdr.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
Index: grass-7.2.2/lib/raster/range.c
|
||||
===================================================================
|
||||
--- grass-7.2.2/lib/raster/range.c (revision 71935)
|
||||
+++ grass-7.2.2/lib/raster/range.c (revision 71944)
|
||||
@@ -13,5 +13,4 @@
|
||||
|
||||
#include <unistd.h>
|
||||
-#include <rpc/types.h> /* need this for sgi */
|
||||
|
||||
#include <grass/raster.h>
|
||||
Index: grass-7.2.2/lib/raster/R.h
|
||||
===================================================================
|
||||
--- grass-7.2.2/lib/raster/R.h (revision 72283)
|
||||
+++ grass-7.2.2/lib/raster/R.h (revision 72284)
|
||||
@@ -1,6 +1,5 @@
|
||||
#include <grass/config.h>
|
||||
#include <grass/gis.h>
|
||||
-#include <rpc/types.h>
|
||||
#ifdef HAVE_GDAL
|
||||
#include <gdal.h>
|
||||
#endif
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (grass-8.4.2.tar.gz) = bbbe219b0d4a7075374c7f8b11de838f014ea0bce84a22dc9089d65fe49fd4f41d8e39867f08fa12ab46e8ff883389c22ccb9976ef89c2fed24834d1ba5cf6fb
|
||||
SHA512 (grass-7.8.3.tar.gz) = 4fa31b869771737b6d11090acfc54dd155c9ac6a259611774a75a74b8ebb59c640dc3417ff8027d91bf3444427525f9c35f32e317677b05809ab3d7aeb03dc84
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue