Update to 2.8.6

2 files changed, 61 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ba012c053f9..19de5a08dd9e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 pkgbase = ros-melodic-gazebo-dev
 	pkgdesc = ROS - Provides a cmake config for the default version of Gazebo for the ROS distribution.
-	pkgver = 2.8.4
-	pkgrel = 2
-	url = http://gazebosim.org/tutorials?cat=connect_ros
+	pkgver = 2.8.6
+	pkgrel = 1
+	url = h
 	arch = any
 	license = Apache 2.0
 	makedepends = cmake
 	makedepends = ros-build-tools
 	makedepends = ros-melodic-catkin
 	depends = gazebo
-	source = ros-melodic-gazebo-dev-2.8.4-0.tar.gz::https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_dev/2.8.4-0.tar.gz
-	sha256sums = 8479a7d0ab9b939b03ad3f436e8bb3d6af22518143cdc51b822337941b1e62d5
+	source = ros-melodic-gazebo-dev-2.8.6.tar.gz::https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_dev/2.8.6.tar.gz
+	sha256sums = 4f9c464529a72e3ae361214c8196c86c4266b7d43f8a490eb778df394a7008a7
 
 pkgname = ros-melodic-gazebo-dev
 
diff --git a/PKGBUILD b/PKGBUILD
index cdfb64194dd4..e458b688293e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,60 +1,56 @@
-# Script generated with import_catkin_packages.py
-# For more information: https://github.com/bchretien/arch-ros-stacks
-pkgdesc="ROS - Provides a cmake config for the default version of Gazebo for the ROS distribution."
-url='http://gazebosim.org/tutorials?cat=connect_ros'
-
-pkgname='ros-melodic-gazebo-dev'
-pkgver='2.8.4'
-_pkgver_patch=0
-arch=('any')
-pkgrel=2
-license=('Apache 2.0')
-
-ros_makedepends=(ros-melodic-catkin)
-makedepends=('cmake' 'ros-build-tools'
-  ${ros_makedepends[@]})
-
-ros_depends=()
-depends=(${ros_depends[@]}
-  gazebo)
-
-# Git version (e.g. for debugging)
-# _tag=release/melodic/gazebo_dev/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/gazebo_ros_pkgs-release.git"#tag=${_tag})
-# sha256sums=('SKIP')
-
-# Tarball version (faster download)
-_dir="gazebo_ros_pkgs-release-release-melodic-gazebo_dev-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_dev/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('8479a7d0ab9b939b03ad3f436e8bb3d6af22518143cdc51b822337941b1e62d5')
-
-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
-
-  # 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 \
-        -DSETUPTOOLS_DEB_LAYOUT=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}/" install
-}
+# Script generated with create_pkgbuild.py
+    # For more information: https://github.com/ros-melodic-arch/ros-build-tools-py3
+    pkgdesc="ROS - Provides a cmake config for the default version of Gazebo for the ROS distribution."
+    url='h'
+
+    pkgname='ros-melodic-gazebo-dev'
+    pkgver='2.8.6'
+    arch=('any')
+    pkgrel=1
+    license=('Apache 2.0')
+
+    ros_makedepends=(ros-melodic-catkin)
+    makedepends=('cmake' 'ros-build-tools'
+    ${ros_makedepends[@]}
+    )
+
+    ros_depends=()
+    depends=(${ros_depends[@]}
+    gazebo)
+    
+    # Tarball version (faster download)
+    _dir="gazebo_ros_pkgs-release-release-melodic-gazebo_dev"
+    source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_dev/${pkgver}.tar.gz")
+    sha256sums=('4f9c464529a72e3ae361214c8196c86c4266b7d43f8a490eb778df394a7008a7')
+
+    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
+
+        # 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_ENABLE_TESTING=0 \
+                -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 \
+                -DSETUPTOOLS_DEB_LAYOUT=OFF
+    make
+    }
+
+    package() {
+    cd "${srcdir}/build"
+    make DESTDIR="${pkgdir}/" install
+    }
+    
\ No newline at end of file