summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorjlaehne2020-09-01 11:22:13 +0200
committerjlaehne2020-09-01 11:22:13 +0200
commit854e05130c39c4964a32714b098459bbeef8ba1b (patch)
tree520f62b8d937ae54d9d9b368c2c847c2f8736575
parent5012889b70d9aab2a9ab2111d27d9175fcd29b1d (diff)
downloadaur-854e05130c39c4964a32714b098459bbeef8ba1b.tar.gz
Fix conflict/provide
Diffstat
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 0 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 23f8dd871051..e1364eeee677 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -35,8 +35,6 @@ pkgbase = python-hyperspy
optdepends = python-hyperspy-gui-traitsui: gui-traitsui
optdepends = python-blosc: mrcz
optdepends = cython: speed
- provides = python-hyperspy
- conflicts = python-hyperspy
replaces = hyperspy
source = https://github.com/hyperspy/hyperspy/archive/v1.6.0.zip
sha256sums = 942294a6a6f76ccb55c510ca07293ef93b3fe4eedd37b840b9c88366624b2026
diff --git a/PKGBUILD b/PKGBUILD
index 0ac774f41ea6..88951600f151 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,9 +25,7 @@ optdepends=('python-scikit-learn: learning'
makedepends=('python-setuptools' )
-provides=('python-hyperspy')
replaces=('hyperspy')
-conflicts=('python-hyperspy')
source=(https://github.com/hyperspy/hyperspy/archive/v$pkgver.zip)
sha256sums=('942294a6a6f76ccb55c510ca07293ef93b3fe4eedd37b840b9c88366624b2026')