#4 Switch scripts to use Python 3 and BR python3-pyopengl (#1771216)
Merged 9 days ago by thofmann. Opened 23 days ago by swt2c.
rpms/ swt2c/gazebo py3  into  master

@@ -0,0 +1,18 @@ 

+ diff -up gazebo-9.5.0/tools/check_test_ran.py.py3 gazebo-9.5.0/tools/check_test_ran.py

+ --- gazebo-9.5.0/tools/check_test_ran.py.py3	2018-11-19 17:34:15.000000000 -0500

+ +++ gazebo-9.5.0/tools/check_test_ran.py	2019-11-11 20:14:29.128822529 -0500

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/env python

+ +#!/usr/bin/python3

+  # Software License Agreement (BSD License)

+  #

+  # Copyright (c) 2008, Willow Garage, Inc.

+ diff -up gazebo-9.5.0/tools/gl-test.py.py3 gazebo-9.5.0/tools/gl-test.py

+ --- gazebo-9.5.0/tools/gl-test.py.py3	2018-11-19 17:34:15.000000000 -0500

+ +++ gazebo-9.5.0/tools/gl-test.py	2019-11-11 20:14:52.391741667 -0500

+ @@ -1,4 +1,4 @@

+ -#!/usr/bin/env python

+ +#!/usr/bin/python3

+  from OpenGL.GLUT import *

+  import sys

+  

file modified
+7 -2

@@ -6,7 +6,7 @@ 

  

  Name:           gazebo

  Version:        9.5.0

- Release:        8%{?dist}

+ Release:        9%{?dist}

  Summary:        3D multi-robot simulator with dynamics

  

  # gazebo/gui/qgv is LGPLv3+

@@ -34,8 +34,9 @@ 

  # Fix the generation of pkgconfig files (-l-lpthread was being introduced)

  # rhbz#1680265

  Patch8:         %{name}-9.5.0-pkgconfig.patch

+ Patch9:         %{name}-9.5.0-python3.patch

  

- BuildRequires:  python2-pyopengl

+ BuildRequires:  python3-pyopengl

  BuildRequires:  boost-devel

  BuildRequires:  bullet-devel

  BuildRequires:  cmake

@@ -174,6 +175,7 @@ 

  %patch6 -p1

  #%patch7 -p1

  %patch8 -p1 -b .pkgconfig

+ %patch9 -p1 -b .py3

  

  # These are either unused, or replaced by system versions

  rm -rf deps/ann

@@ -334,6 +336,9 @@ 

  %{_libdir}/cmake/*

  

  %changelog

+ * Tue Nov 12 2019 Scott Talbert <swt@techie.net> - 9.5.0-9

+ - Switch scripts to use Python 3 and BR python3-pyopengl (#1771216)

+ 

  * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 9.5.0-8

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

  

no initial comment

Pull-Request has been merged by thofmann

9 days ago

I went ahead and merged this -- thanks for the fix! Build is on the way.