updpkg

2 files changed, 23 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4ef62c463aaa..4b7439e589d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
-pkgbase = ros-melodic-desktop-full
+pkgbase = ros-noetic-desktop-full
 	pkgdesc = ROS - A metapackage to aggregate several packages.
-	pkgver = 1.4.1
-	pkgrel = 2
+	pkgver = 1.5.0
+	pkgrel = 1
 	url = https://github.com/ros/metapackages
 	arch = any
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	depends = ros-melodic-desktop
-	depends = ros-melodic-simulators
-	depends = ros-melodic-perception
-	depends = ros-melodic-urdf-sim-tutorial
-	source = ros-melodic-desktop-full-1.4.1.tar.gz::https://github.com/ros/metapackages/archive/1.4.1.tar.gz
-	sha256sums = ef1df96c61c9762555174cc1a0e21e05149f74909d27044be0cd10aa065747a1
+	makedepends = ros-noetic-catkin
+	depends = ros-noetic-desktop
+	depends = ros-noetic-simulators
+	depends = ros-noetic-perception
+	depends = ros-noetic-urdf-sim-tutorial
+	source = ros-noetic-desktop-full-1.5.0.tar.gz::https://github.com/ros/metapackages/archive/1.5.0.tar.gz
+	sha256sums = 5e055b7528d088cf62035d88c78cfd5aefcac2a96d0ce2ac62242f6d6f76d3b0
 
-pkgname = ros-melodic-desktop-full
+pkgname = ros-noetic-desktop-full
 
diff --git a/PKGBUILD b/PKGBUILD
index db6aaae406c9..8f8027e5c9a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,55 +3,40 @@
 pkgdesc="ROS - A metapackage to aggregate several packages."
 url='https://github.com/ros/metapackages'
 
-pkgname='ros-melodic-desktop-full'
-pkgver='1.4.1'
-_pkgver_patch=0
+pkgname='ros-noetic-desktop-full'
+pkgver='1.5.0'
 arch=('any')
-pkgrel=2
+pkgrel=1
 license=('BSD')
 
-ros_makedepends=(ros-melodic-catkin)
+ros_makedepends=(ros-noetic-catkin)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-desktop
-  ros-melodic-simulators
-  ros-melodic-perception
-  ros-melodic-urdf-sim-tutorial)
+ros_depends=(ros-noetic-desktop
+  ros-noetic-simulators
+  ros-noetic-perception
+  ros-noetic-urdf-sim-tutorial)
 depends=(${ros_depends[@]})
 
-# Git version (e.g. for debugging)
-# _tag=release/melodic/desktop_full/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/metapackages-release.git"#tag=${_tag})
-# sha256sums=('SKIP')
-
-# Tarball version (faster download)
 _dir="metapackages-${pkgver}/desktop_full"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/metapackages/archive/${pkgver}.tar.gz")
-sha256sums=('ef1df96c61c9762555174cc1a0e21e05149f74909d27044be0cd10aa065747a1')
+sha256sums=('5e055b7528d088cf62035d88c78cfd5aefcac2a96d0ce2ac62242f6d6f76d3b0')
 
 build() {
   # Use ROS environment variables
   source /usr/share/ros-build-tools/clear-ros-env.sh
-  [ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash
+  [ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
 
   # Create build directory
   [ -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 project
   cmake ${srcdir}/${_dir} \
-        -DCMAKE_BUILD_TYPE=Release \
         -DCATKIN_BUILD_BINARY_PACKAGE=ON \
-        -DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
-        -DPYTHON_EXECUTABLE=/usr/bin/python3 \
-        -DPYTHON_INCLUDE_DIR=/usr/include/python3.7m \
-        -DPYTHON_LIBRARY=/usr/lib/libpython3.7m.so \
-        -DPYTHON_BASENAME=.cpython-37m \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+        -DPYTHON_EXECUTABLE=/usr/bin/python \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }