Version bump.

2 files changed, 12 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 479f63c46b89..1e940ecf3257 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Jun  4 02:11:34 UTC 2017
+# Sun Jul  9 17:58:44 UTC 2017
 pkgbase = ros-kinetic-rviz
 	pkgdesc = ROS - 3D visualization tool for ROS.
-	pkgver = 1.12.4
-	pkgrel = 2
+	pkgver = 1.12.10
+	pkgrel = 1
 	url = http://ros.org/wiki/rviz
 	arch = any
 	license = BSD, Creative Commons
@@ -32,8 +32,8 @@ pkgbase = ros-kinetic-rviz
 	makedepends = ros-kinetic-python-qt-binding
 	makedepends = ros-kinetic-roscpp
 	makedepends = ros-kinetic-laser-geometry
-	makedepends = ogre-1.9
 	makedepends = qt5-base
+	makedepends = ogre-1.9
 	makedepends = urdfdom-headers
 	makedepends = assimp
 	makedepends = eigen3
@@ -62,16 +62,16 @@ pkgbase = ros-kinetic-rviz
 	depends = ros-kinetic-python-qt-binding
 	depends = ros-kinetic-roscpp
 	depends = ros-kinetic-laser-geometry
-	depends = ogre-1.9
 	depends = qt5-base
+	depends = ogre-1.9
 	depends = urdfdom-headers
 	depends = assimp
 	depends = eigen3
 	depends = tinyxml
 	depends = mesa
 	depends = yaml-cpp
-	source = ros-kinetic-rviz-1.12.4-0.tar.gz::https://github.com/ros-gbp/rviz-release/archive/release/kinetic/rviz/1.12.4-0.tar.gz
-	sha256sums = de4956ef477a4bcf5ce0e8e6b323d8a5b238a26c792201422931e7249a56292a
+	source = ros-kinetic-rviz-1.12.10-0.tar.gz::https://github.com/ros-gbp/rviz-release/archive/release/kinetic/rviz/1.12.10-0.tar.gz
+	sha256sums = affc1e084f0927f99a567a35925a965485fa9afc6e3948e9c37af21e577b686d
 
 pkgname = ros-kinetic-rviz
 
diff --git a/PKGBUILD b/PKGBUILD
index 898920d24b38..a27769e360d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,10 @@ pkgdesc="ROS - 3D visualization tool for ROS."
 url='http://ros.org/wiki/rviz'
 
 pkgname='ros-kinetic-rviz'
-pkgver='1.12.4'
+pkgver='1.12.10'
 _pkgver_patch=0
 arch=('any')
-pkgrel=2
+pkgrel=1
 license=('BSD, Creative Commons')
 
 ros_makedepends=(ros-kinetic-map-msgs
@@ -35,8 +35,8 @@ ros_makedepends=(ros-kinetic-map-msgs
   ros-kinetic-laser-geometry)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]}
-  ogre-1.9
   qt5-base
+  ogre-1.9
   urdfdom-headers
   assimp
   eigen3
@@ -67,8 +67,8 @@ ros_depends=(ros-kinetic-resource-retriever
   ros-kinetic-roscpp
   ros-kinetic-laser-geometry)
 depends=(${ros_depends[@]}
-  ogre-1.9
   qt5-base
+  ogre-1.9
   urdfdom-headers
   assimp
   eigen3
@@ -85,7 +85,7 @@ depends=(${ros_depends[@]}
 # Tarball version (faster download)
 _dir="rviz-release-release-kinetic-rviz-${pkgver}-${_pkgver_patch}"
 source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/rviz-release/archive/release/kinetic/rviz/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('de4956ef477a4bcf5ce0e8e6b323d8a5b238a26c792201422931e7249a56292a')
+sha256sums=('affc1e084f0927f99a567a35925a965485fa9afc6e3948e9c37af21e577b686d')
 
 build() {
   # Use ROS environment variables
@@ -99,8 +99,6 @@ build() {
   # Fix Python2/Python3 conflicts
   /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir}
 
-  export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/OGRE-1.9/lib/pkgconfig/
-
   # Build project
   cmake ${srcdir}/${_dir} \
         -DCMAKE_BUILD_TYPE=Release \