Update version and changed source to official ROS releases

2 files changed, 7 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 600225573f04..f60e536f419f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ros-melodic-rosmake
 	pkgdesc = ROS - rosmake is a ros dependency aware build tool which can be used to build all dependencies in the correct order.
-	pkgver = 1.14.4
+	pkgver = 1.14.6
 	pkgrel = 1
 	url = http://ros.org/wiki/rosmake
 	arch = any
@@ -10,8 +10,8 @@ pkgbase = ros-melodic-rosmake
 	makedepends = ros-melodic-catkin
 	depends = ros-melodic-catkin
 	depends = python-rospkg
-	source = ros-melodic-rosmake-1.14.4-0.tar.gz::https://github.com/ros-gbp/ros-release/archive/release/melodic/rosmake/1.14.4-0.tar.gz
-	sha256sums = eae91dbf54d8a8b4d5e6b34880d6a6c49f77584a3be8dbca37762bb5b9186fca
+	source = ros-melodic-rosmake-1.14.6.tar.gz::https://github.com/ros/ros/archive/1.14.6.tar.gz
+	sha256sums = 62f1350271a76bc35794c2cdb741cdae2ba096c96a924dba025aed4f561c978c
 
 pkgname = ros-melodic-rosmake
 
diff --git a/PKGBUILD b/PKGBUILD
index 5857b7b4f0cd..0ac65e5fb39a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,7 @@ pkgdesc="ROS - rosmake is a ros dependency aware build tool which can be used to
 url='http://ros.org/wiki/rosmake'
 
 pkgname='ros-melodic-rosmake'
-pkgver='1.14.4'
-_pkgver_patch=0
+pkgver='1.14.6'
 arch=('any')
 pkgrel=1
 license=('BSD')
@@ -29,9 +28,9 @@ depends=(
 	python-rospkg
 )
 
-_dir="ros-release-release-melodic-rosmake-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/ros-release/archive/release/melodic/rosmake/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('eae91dbf54d8a8b4d5e6b34880d6a6c49f77584a3be8dbca37762bb5b9186fca')
+_dir="ros-${pkgver}/tools/rosmake"
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/ros/archive/${pkgver}.tar.gz")
+sha256sums=('62f1350271a76bc35794c2cdb741cdae2ba096c96a924dba025aed4f561c978c')
 
 build() {
 	# Use ROS environment variables.