summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2020-06-12 09:01:18 +0200
committerbartus2020-06-12 09:01:18 +0200
commitd2b59450a90c95b058c64ab9a6da061d0578af0e (patch)
treebc2703b51131a73038fc1b5035c140f1dea025da
parentb3c57eaac9fa6ce74757e9f839ddaa13cb04bf81 (diff)
downloadaur-d2b59450a90c95b058c64ab9a6da061d0578af0e.tar.gz
Remove dropped packages from $conflicts
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 1 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 32d1be88eca2..812c6b478f56 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,8 +7,6 @@ pkgbase = blender-plugin-luxcorerender-git
license = GPL
makedepends = git
provides = blender-plugin-luxcorerender
- conflicts = luxblend25
- conflicts = luxblend25-hg
conflicts = blender-plugin-luxcorerender
source = luxcorerender::git+https://github.com/LuxCoreRender/BlendLuxCore.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index d8305ba42ec9..27c2c8d41924 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ arch=('any')
url="https://luxcorerender.org/"
license=('GPL')
makedepends=(git)
-conflicts=(luxblend25 luxblend25-hg blender-plugin-luxcorerender)
+conflicts=(blender-plugin-luxcorerender)
provides=(blender-plugin-luxcorerender)
source=("${_name}::git+https://github.com/LuxCoreRender/BlendLuxCore.git${_fragment}")
md5sums=("SKIP")