Accepting request 736463 from home:Guillaume_G:branches:science:machinelearning

- Fix Python scripts interpreter
- Fix -devel package dep
- Drop gcc 4.8 workaround

OBS-URL: https://build.opensuse.org/request/show/736463
OBS-URL: https://build.opensuse.org/package/show/science:machinelearning/ComputeLibrary?expand=0&rev=4

ComputeLibrary.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct  9 08:49:21 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Fix Python scripts interpreter
+- Fix -devel package dep
+- Drop gcc 4.8 workaround
+
 -------------------------------------------------------------------
 Thu Sep  5 07:22:11 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 

ComputeLibrary.spec

@@ -15,13 +15,6 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-
-%ifarch aarch64
-%if 0%{?suse_version} == 1315
-%define broken_gcc48 1
-%endif
-%endif
-
 %define so_ver 16
 
 # Disable validation tests by default due to CL
@@ -35,12 +28,7 @@ License:        MIT
 Group:          Productivity/Graphics/Other
 Url:            https://developer.arm.com/technologies/compute-library
 Source:         https://github.com/ARM-software/ComputeLibrary/archive/v%{version}.tar.gz#/ComputeLibrary-%{version}.tar.gz
-%if 0%{?broken_gcc48}
-BuildRequires:  gcc5
-BuildRequires:  gcc5-c++
-%else
 BuildRequires:  gcc-c++
-%endif
 BuildRequires:  git
 BuildRequires:  ocl-icd-devel
 BuildRequires:  scons >= 2.4
@@ -66,7 +54,8 @@ Library part.
 %package devel
 Summary:        ARM Compute Library -- devel
 Group:          Development/Languages/C and C++
-Requires:       libarm_compute%{so_ver}
+Requires:       %{name} == %{version}
+Requires:       libarm_compute%{so_ver} == %{version}
 
 %description devel
 A software library for computer vision and machine learning.
@@ -85,10 +74,6 @@ Free *.npy and *.ppm files to use with example binaries.
 %setup -q -n ComputeLibrary-%{version}
 
 %build
-%if 0%{?broken_gcc48}
-export CC=gcc-5
-export CXX=g++-5
-%endif
 scons os=linux build=native \
       set_soname=1 \
       examples=1 \
@@ -126,6 +111,10 @@ mkdir -p %{buildroot}%{_datadir}/ComputeLibrary/%{sampledir}
 cp -r data/* %{buildroot}%{_datadir}/ComputeLibrary/%{sampledir}
 # Install scripts
 cp scripts/* %{buildroot}%{_bindir}
+# Fix Python scripts interpreter
+for pyfile in `ls %{buildroot}%{_bindir}/*.py`; do
+  sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/python|' $pyfile
+done
 
 %post -n libarm_compute%{so_ver} -p /sbin/ldconfig