2 files changed, 5 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1dabd3725336..e8c6ba858183 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ros-melodic-catkin
 	pkgdesc = ROS - Low-level build system macros and infrastructure for ROS.
 	pkgver = 0.7.29
-	pkgrel = 3
+	pkgrel = 2
 	epoch = 1
 	url = https://www.wiki.ros.org/catkin
 	arch = any
@@ -16,7 +16,7 @@ pkgbase = ros-melodic-catkin
 	depends = python-empy
 	depends = gmock
 	depends = python
-	depends = ros-build-tools-py3
+	depends = ros-build-tools
 	source = ros-melodic-catkin-0.7.29.tar.gz::https://github.com/ros/catkin/archive/0.7.29.tar.gz
 	source = ros-melodic-catkin-0.7.29-7fa3eb3.patch::https://github.com/ros/catkin/commit/7fa3eb3508ba12c34d85b8e54bbdf4bbdc60a5c1.patch
 	sha256sums = 8a86803b9081b19d2d37c3d028cc9f7bdfc7122f6204ec7e77ae0cbfda57ff71
diff --git a/PKGBUILD b/PKGBUILD
index 47c71e0b9008..2d4002dc2af3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@ url='https://www.wiki.ros.org/catkin'
 
 pkgname='ros-melodic-catkin'
 pkgver='0.7.29'
-epoch=1
+epoch='1'
 arch=('any')
-pkgrel=3
+pkgrel='2'
 license=('BSD')
 
 ros_makedepends=(
@@ -30,7 +30,7 @@ depends=(
 	python-empy
 	gmock
 	python
-	ros-build-tools-py3
+	ros-build-tools
 )
 
 _dir="catkin-${pkgver}/"
@@ -53,9 +53,6 @@ build() {
 	[ -d ${srcdir}/build ] || mkdir ${srcdir}/build
 	cd ${srcdir}/build
 
-	# Fix Python2/Python3 conflicts.
-	/usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
-
 	# Build the project.
 	cmake ${srcdir}/${_dir} \
 		-DCMAKE_BUILD_TYPE=Release \