update fiona to 1.8.22 and add python3-et-xmlfile (missing dependency…

… of openpyxl)
jef-n · Dec 7, 2022 · 6ff9719 · 6ff9719 · jef-n · Dec 7, 2022
1 parent f8d673b
commit 6ff9719
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/scripts/pippkg.py b/scripts/pippkg.py
@@ -263,7 +263,7 @@ def GetLongPathName(p):
 """ .format(
         props['Summary'],
         environ['MAINTAINER'],
-        (" " + " ".join(sorted('python3-{}'.format(p) for p in props['Requires']))) if props['Requires'] else "",
+        (" " + " ".join(sorted('python3-{}'.format(p.replace('_', '-')) for p in props['Requires']))) if props['Requires'] else "",
         (" " + environ['adddepends']) if 'adddepends' in environ else ''
     ).encode("utf-8")
 )

diff --git a/src/python3-et-xmlfile/osgeo4w/package.sh b/src/python3-et-xmlfile/osgeo4w/package.sh
@@ -0,0 +1,13 @@
+export P=python3-et-xmlfile
+export V=pip
+export B=pip
+export MAINTAINER=JuergenFischer
+export BUILDDEPENDS="python3-pip python3-wheel python3-setuptools"
+
+source ../../../scripts/build-helpers
+
+startlog
+
+packagewheel
+
+endlog
diff --git a/src/python3-fiona/osgeo4w/package.sh b/src/python3-fiona/osgeo4w/package.sh
@@ -10,9 +10,13 @@ startlog
 
 major=$(sed -ne "s/# *define *GDAL_VERSION_MAJOR *//p" osgeo4w/include/gdal_version.h)
 minor=$(sed -ne "s/# *define *GDAL_VERSION_MINOR *//p" osgeo4w/include/gdal_version.h)
+rev=$(sed -ne "s/# *define *GDAL_VERSION_REV *//p" osgeo4w/include/gdal_version.h)
+major=${major%}
+minor=${minor%}
+rev=${rev%}
 
 cat <<EOF >pip.env
-export GDAL_VERSION=$major.$minor
+export GDAL_VERSION=$major.$minor.$rev
 export INCLUDE="$(cygpath -am osgeo4w/include);\$INCLUDE"
 export LIB="$(cygpath -am osgeo4w/lib);\$LIB"
 EOF