Remove netradiant-custom from the conflicts

2 files changed, 11 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e291f3c7fff0..99b60e8b7663 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,24 +9,23 @@ pkgbase = netradiant-git
 	license = GPL
 	license = BSD
 	license = LGPL
+	makedepends = cmake
 	makedepends = git
+	makedepends = make
 	makedepends = svn
-	makedepends = wget
 	makedepends = unzip
-	makedepends = cmake
-	makedepends = make
+	makedepends = wget
 	depends = gtk2
 	depends = gtkglext
-	depends = minizip
 	depends = libjpeg-turbo
 	depends = libwebp
+	depends = minizip
 	provides = netradiant
-	provides = q3map2
-	provides = q3data
+	provides = h2data
 	provides = q2map
+	provides = q3data
+	provides = q3map2
 	provides = qdata3
-	provides = h2data
-	conflicts = netradiant-custom
 	source = netradiant-git::git+https://gitlab.com/xonotic/netradiant.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 7e92bf245fb2..bfc97764240d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,17 +3,16 @@
 # Contributor: J0k3r <moebius282 at gmail dot com>
 
 pkgname=netradiant-git
-pkgver=r2538.9404124f
+pkgver=r2555.7a730843
 pkgrel=1
 epoch=1
 pkgdesc='The open source, cross platform level editor for idtech games (GtkRadiant fork)'
 url='https://netradiant.gitlab.io/'
 license=('GPL' 'BSD' 'LGPL')
 arch=('i686' 'x86_64')
-depends=('gtk2' 'gtkglext' 'minizip' 'libjpeg-turbo' 'libwebp')
-makedepends=('git' 'svn' 'wget' 'unzip' 'cmake' 'make')
-provides=('netradiant' 'q3map2' 'q3data' 'q2map' 'qdata3' 'h2data')
-conflicts=('netradiant-custom')
+depends=('gtk2' 'gtkglext' 'libjpeg-turbo' 'libwebp' 'minizip')
+makedepends=('cmake' 'git' 'make' 'svn' 'unzip' 'wget')
+provides=('netradiant' 'h2data' 'q2map' 'q3data' 'q3map2' 'qdata3')
 source=("${pkgname}::git+https://gitlab.com/xonotic/netradiant.git")
 sha256sums=('SKIP')