summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFélix Piédallu2019-05-16 00:17:18 +0200
committerFélix Piédallu2019-05-16 00:17:18 +0200
commit9392f390dd4067945d1b293085dda911d4105176 (patch)
tree366af8d0ec3f362173d67803ac3c63010c390bbb
parent1554d1e03d5a0d735463fbec5050baa99e2b8898 (diff)
downloadaur-9392f390dd4067945d1b293085dda911d4105176.tar.gz
forgot a conflict
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD4
2 files changed, 3 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b752b430c617..20782e08dc62 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,6 +18,7 @@ pkgbase = prusaslicer-git
depends = glew
depends = intel-tbb
depends = nlopt
+ conflicts = slic3r-prusa3d-git
conflicts = slic3r-prusa3d
conflicts = slic3r
conflicts = prusaslicer
diff --git a/PKGBUILD b/PKGBUILD
index 4eab2853397d..ae07601d8064 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,8 +26,8 @@ sha256sums=(
'e4da3d40061de6eb51a4364a6724d376a39bbc631cec5e453b2fdaea36e02f52'
)
-conflicts=('slic3r-prusa3d' 'slic3r' 'prusaslicer')
-replaces=('slic3r-prusa3d-git')
+conflicts=('slic3r-prusa3d-git' 'slic3r-prusa3d' 'slic3r' 'prusaslicer')
+replaces=( 'slic3r-prusa3d-git')
pkgver() {
cd "${srcdir}/PrusaSlicer"