upd to noetic, cmake vars, python

2 files changed, 26 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a4585da6e613..5323d9e5ea05 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = ros-melodic-geographic-msgs
+pkgbase = ros-noetic-geographic-msgs
 	pkgdesc = ROS - ROS messages for Geographic Information Systems.
 	pkgver = 0.5.3
 	pkgrel = 2
@@ -7,17 +7,17 @@ pkgbase = ros-melodic-geographic-msgs
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-message-generation
-	makedepends = ros-melodic-geometry-msgs
-	makedepends = ros-melodic-uuid-msgs
-	makedepends = ros-melodic-std-msgs
-	depends = ros-melodic-message-runtime
-	depends = ros-melodic-geometry-msgs
-	depends = ros-melodic-uuid-msgs
-	depends = ros-melodic-std-msgs
-	source = ros-melodic-geographic-msgs-0.5.3.tar.gz::https://github.com/ros-geographic-info/geographic_info/archive/geographic_info-0.5.3.tar.gz
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-message-generation
+	makedepends = ros-noetic-geometry-msgs
+	makedepends = ros-noetic-uuid-msgs
+	makedepends = ros-noetic-std-msgs
+	depends = ros-noetic-message-runtime
+	depends = ros-noetic-geometry-msgs
+	depends = ros-noetic-uuid-msgs
+	depends = ros-noetic-std-msgs
+	source = ros-noetic-geographic-msgs-0.5.3.tar.gz::https://github.com/ros-geographic-info/geographic_info/archive/geographic_info-0.5.3.tar.gz
 	sha256sums = 2a2de063b17dc00c20bd49d59ded6934081fc22d8749dc8542d407d1ca0e608e
 
-pkgname = ros-melodic-geographic-msgs
+pkgname = ros-noetic-geographic-msgs
 
diff --git a/PKGBUILD b/PKGBUILD
index b75a643b02d7..46f9f7ce2537 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,28 +3,28 @@
 pkgdesc="ROS - ROS messages for Geographic Information Systems."
 url='https://wiki.ros.org/geographic_msgs'
 
-pkgname='ros-melodic-geographic-msgs'
+pkgname='ros-noetic-geographic-msgs'
 pkgver='0.5.3'
 arch=('any')
 pkgrel=2
 license=('BSD')
 
-ros_makedepends=(ros-melodic-catkin
-  ros-melodic-message-generation
-  ros-melodic-geometry-msgs
-  ros-melodic-uuid-msgs
-  ros-melodic-std-msgs)
+ros_makedepends=(ros-noetic-catkin
+  ros-noetic-message-generation
+  ros-noetic-geometry-msgs
+  ros-noetic-uuid-msgs
+  ros-noetic-std-msgs)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-melodic-message-runtime
-  ros-melodic-geometry-msgs
-  ros-melodic-uuid-msgs
-  ros-melodic-std-msgs)
+ros_depends=(ros-noetic-message-runtime
+  ros-noetic-geometry-msgs
+  ros-noetic-uuid-msgs
+  ros-noetic-std-msgs)
 depends=(${ros_depends[@]})
 
 # Git version (e.g. for debugging)
-# _tag=release/melodic/geographic_msgs/${pkgver}-${_pkgver_patch}
+# _tag=release/noetic/geographic_msgs/${pkgver}-${_pkgver_patch}
 # _dir=${pkgname}
 # source=("${_dir}"::"git+https://github.com/ros-geographic-info/geographic_info-release.git"#tag=${_tag})
 # sha256sums=('SKIP')
@@ -37,24 +37,17 @@ sha256sums=('2a2de063b17dc00c20bd49d59ded6934081fc22d8749dc8542d407d1ca0e608e')
 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
 }