Fix conflict with openclonk-music

2 files changed, 2 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 499944e8587a..589cda24a6d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,11 +19,10 @@ pkgbase = openclonk-git
 	depends = desktop-file-utils
 	depends = qt5-base
 	depends = hicolor-icon-theme
-	optdepends = openclonk-music: proprietary music package
 	provides = openclonk
 	conflicts = clonk_rage
 	conflicts = openclonk
-	conflicts = clonk_rage-git
+	conflicts = openclonk-music
 	source = openclonk-git::git+https://git.openclonk.org/openclonk.git#branch=master
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 37838dc03e30..b5c013890a65 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,8 +16,7 @@ depends=('glew' 'freealut' 'miniupnpc' 'libxrandr' 'sdl2' 'sdl_mixer>=1.2' 'desk
 install=openclonk.install
 makedepends=('cmake' 'boost' 'mesa')
 provides=('openclonk')
-optdepends=('openclonk-music: proprietary music package')
-conflicts=('clonk_rage' 'openclonk' 'clonk_rage-git')
+conflicts=('clonk_rage' 'openclonk' 'openclonk-music')
 source=("$pkgname::git+https://git.openclonk.org/openclonk.git#branch=master")
 md5sums=('SKIP')