diff --git a/.gitignore b/.gitignore index 2363efb..2d849e2 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /grass-7.8.3.tar.gz /grass-7.8.4.tar.gz /grass-7.8.5.tar.gz +/grass-7.8.6.tar.gz diff --git a/grass-7.8.0-buildroot.diff b/grass-7.8.0-buildroot.diff deleted file mode 100644 index 6c29c54..0000000 --- a/grass-7.8.0-buildroot.diff +++ /dev/null @@ -1,23 +0,0 @@ -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' \ - $< > $@ diff --git a/grass-bool.patch b/grass-bool.patch deleted file mode 100644 index d593e5a..0000000 --- a/grass-bool.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -rupN grass-7.8.5/vector/v.hull/chull.c grass-7.8.5-new/vector/v.hull/chull.c ---- grass-7.8.5/vector/v.hull/chull.c 2020-12-21 19:40:15.000000000 +0100 -+++ grass-7.8.5-new/vector/v.hull/chull.c 2021-05-10 10:56:36.399167493 +0200 -@@ -31,7 +31,7 @@ - - /*Define Boolean type */ - typedef enum --{ BFALSE, BTRUE } bool; -+{ BFALSE, BTRUE } grass_bool; - - /* Define vertex indices. */ - #define X 0 -@@ -53,8 +53,8 @@ struct tVertexStructure - double v[3]; - int vnum; - tEdge duplicate; /* pointer to incident cone edge (or NULL) */ -- bool onhull; /* T iff point on hull. */ -- bool mark; /* T iff point already processed. */ -+ grass_bool onhull; /* T iff point on hull. */ -+ grass_bool mark; /* T iff point already processed. */ - tVertex next, prev; - }; - -@@ -63,7 +63,7 @@ struct tEdgeStructure - tFace adjface[2]; - tVertex endpts[2]; - tFace newface; /* pointer to incident cone face. */ -- bool delete; /* T iff edge should be delete. */ -+ grass_bool delete; /* T iff edge should be delete. */ - tEdge next, prev; - }; - -@@ -71,7 +71,7 @@ struct tFaceStructure - { - tEdge edge[3]; - tVertex vertex[3]; -- bool visible; /* T iff face visible from new point. */ -+ grass_bool visible; /* T iff face visible from new point. */ - tFace next, prev; - }; - -@@ -92,7 +92,7 @@ void ReadVertices(double *px, double *py - void writeVertices(struct Map_info *Map); - int DoubleTriangle(void); - void ConstructHull(void); --bool AddOne(tVertex p); -+grass_bool AddOne(tVertex p); - int VolumeSign(tFace f, tVertex p); - tFace MakeConeFace(tEdge e, tVertex p); - void MakeCcw(tFace f, tEdge e, tVertex p); -@@ -103,7 +103,7 @@ void CleanUp(void); - void CleanEdges(void); - void CleanFaces(void); - void CleanVertices(void); --bool Collinear(tVertex a, tVertex b, tVertex c); -+grass_bool Collinear(tVertex a, tVertex b, tVertex c); - - #include "macros.h" - -@@ -388,7 +388,7 @@ vertices are those in the list marked as - void ConstructHull(void) - { - tVertex v, vnext; -- bool changed; /* T if addition changes hull; not used. */ -+ grass_bool changed; /* T if addition changes hull; not used. */ - int i; - int numVertices; - -@@ -431,12 +431,12 @@ onhull. Next is a loop over edges. If - are visible, then the edge is marked for deletion. If just one of the - adjacent faces is visible then a new face is constructed. - ---------------------------------------------------------------------*/ --bool AddOne(tVertex p) -+grass_bool AddOne(tVertex p) - { - tFace f; - tEdge e, temp; - long int vol; -- bool vis = BFALSE; -+ grass_bool vis = BFALSE; - - - /* Mark faces visible from p. */ -@@ -789,7 +789,7 @@ void CleanVertices(void) - Collinear checks to see if the three points given are collinear, - by checking to see if each element of the cross product is zero. - ---------------------------------------------------------------------*/ --bool Collinear(tVertex a, tVertex b, tVertex c) -+grass_bool Collinear(tVertex a, tVertex b, tVertex c) - { - return - (c->v[Z] - a->v[Z]) * (b->v[Y] - a->v[Y]) - diff --git a/grass.spec b/grass.spec index 4c4423e..502fe8b 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.5 -Release: 11%{?dist} +Version: 7.8.6 +Release: 1%{?dist} Summary: GRASS GIS - Geographic Resources Analysis Support System %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 @@ -24,11 +24,6 @@ License: GPLv2+ URL: https://grass.osgeo.org Source0: https://grass.osgeo.org/%{name}%{shortver}/source/%{name}-%{version}.tar.gz -Patch1: grass-7.8.0-buildroot.diff -# Fix typename collision with custom "bool" type and bool from stdbool.h -Patch2: grass-bool.patch -Patch3: grass78_ctypes_py3_10.diff - BuildRequires: bison %if %{with flexiblas} BuildRequires: flexiblas-devel @@ -179,10 +174,6 @@ GRASS GIS development headers %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 - # Correct mysql_config query sed -i -e 's/--libmysqld-libs/--libs/g' configure @@ -203,7 +194,7 @@ CXXFLAGS="-std=c++98 ${CFLAGS}" --with-png \ --with-postgres \ %if 0%{?rhel} > 7 - --with-mysql=no \ + --with-mysql=no \ %else --with-mysql \ %endif @@ -250,30 +241,16 @@ make %{?_smp_mflags} # this is not FHS compliant: hide grass-%%{version} in %%{libdir} %install %make_install \ - DESTDIR=%{buildroot}%{_libdir} \ - prefix=%{buildroot}%{_libdir} \ - UNIX_BIN=%{buildroot}%{_bindir} \ + DESTDIR=%{buildroot} \ + prefix=%{_libdir} \ + UNIX_BIN=%{_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|%{_prefix}/%{name}-%{version}|%{_libdir}/%{name}%{shortver}|g' \ +sed -i -e 's|%{_libdir}/%{name}-%{version}|%{_libdir}/%{name}%{shortver}|g' \ %{name}.pc mkdir -p %{buildroot}%{_libdir}/pkgconfig @@ -385,6 +362,9 @@ fi %{_libdir}/%{name}%{shortver}/include %changelog +* Tue Nov 02 2021 Markus Neteler - 7.8.6-1 +- New upstream version GRASS GIS 7.8.6 + * Thu Oct 21 2021 Sandro Mani - 7.8.5-11 - Rebuild (geos) diff --git a/grass78_ctypes_py3_10.diff b/grass78_ctypes_py3_10.diff deleted file mode 100644 index b5207bf..0000000 --- a/grass78_ctypes_py3_10.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git grass-7.8.5/lib/python/ctypes/ctypesgencore/parser/lex.py grass-7.8.5-new/lib/python/ctypes/ctypesgencore/parser/lex.py -index 294d902d9..0d1447400 100644 ---- grass-7.8.5/lib/python/ctypes/ctypesgencore/parser/lex.py -+++ grass-7.8.5-new/lib/python/ctypes/ctypesgencore/parser/lex.py -@@ -348,7 +348,7 @@ class Lexer: - break - - # if func not callable, it means it's an ignored token -- if not isinstance(func, collections.Callable): -+ if not isinstance(func, collections.abc.Callable): - break - - # If token is processed by a function, call it -@@ -720,7 +720,7 @@ def lex(module=None, object=None, debug=0, optimize=0, - states, tokname = _statetoken(f, stateinfo) - toknames[f] = tokname - -- if isinstance(t, collections.Callable): -+ if isinstance(t, collections.abc.Callable): - for s in states: - funcsym[s].append((f, t)) - elif (isinstance(t, bytes) or isinstance(t, str)): diff --git a/sources b/sources index 86a1161..9d7b11b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grass-7.8.5.tar.gz) = 054923e31c163b50537e89636da97cdb705f3a77e566ef869b8aa77303b1c6fa3040f198a2cdc639b773843fe38e50c40149ef683beb0cd2dcf1ca2f77d3dd65 +SHA512 (grass-7.8.6.tar.gz) = 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df