Added Conflict

2 files changed, 5 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
index baaa04d5036e..8ec4060a1afa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -28,6 +28,7 @@ pkgbase = ros-melodic-roscpp
 	depends = ros-melodic-rosconsole
 	depends = ros-melodic-roscpp-serialization
 	depends = ros-melodic-message-runtime
+	conflicts = ros-melodic-roscpp-git
 	source = ros-melodic-roscpp-1.12.14.tar.gz::https://github.com/ros/ros_comm/archive/1.12.14.tar.gz
 	sha256sums = 239c225cc9b1613cc7f76daf73c182f991787b7cf601287cb6cc28957eeeec1d
 
diff --git a/PKGBUILD b/PKGBUILD
index 44f341581426..87089118b0c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -46,6 +46,10 @@ depends=(
 	${ros_depends[@]}
 )
 
+conflicts=(
+	ros-melodic-roscpp-git
+)
+
 _dir="ros_comm-${pkgver}/clients/roscpp"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/ros_comm/archive/${pkgver}.tar.gz")
 sha256sums=('239c225cc9b1613cc7f76daf73c182f991787b7cf601287cb6cc28957eeeec1d')