summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Morlot2022-09-06 13:57:49 +0200
committerMartin Morlot2022-09-06 13:57:49 +0200
commita9d78cd2b3852a3542fdfa132ea2bcf9c5310304 (patch)
tree16fd18df0a2a3ce38329f06c6c59b67a039e590e
parent0fe7c1546e5e52fa99ae9fe664f1e4bdaf8e9ca0 (diff)
downloadaur-a9d78cd2b3852a3542fdfa132ea2bcf9c5310304.tar.gz
Fix conflict issues
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
2 files changed, 7 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7593cff03e14..363574361aa4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -100,5 +100,7 @@ pkgname = gdal-hdf4
pkgname = python-gdal-hdf4
pkgdesc = Python bindings for GDAL
- depends = gdal=3.5.1
+ depends = gdal-hdf4=3.5.1
depends = python-numpy
+ provides = python-gdal
+ conflicts = python-gdal
diff --git a/PKGBUILD b/PKGBUILD
index b342c524b5e7..12631d7cef99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -109,8 +109,10 @@ package_gdal-hdf4 () {
package_python-gdal-hdf4 () {
pkgdesc="Python bindings for GDAL"
- depends=("gdal=$pkgver" 'python-numpy')
-
+ depends=("gdal-hdf4=$pkgver" 'python-numpy')
+ provides=("python-gdal")
+ conflicts=("python-gdal")
+
install -d "${pkgdir}"/usr/{bin,lib}
mv bin/* "${pkgdir}"/usr/bin
mv lib/* "${pkgdir}"/usr/lib