Packman Build Service PMBS

Changes of Revision 10

chromium-ffmpeg-extra.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package chromium-ffmpeg-extra
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,18 +20,17 @@
 Version:        64.0.3282.134
 Release:        0
 Summary:        Extra ffmpeg codecs for browsers based on Chromium
-License:        BSD-3-Clause and LGPL-2.1+
+License:        BSD-3-Clause AND LGPL-2.1+
 Group:          Productivity/Networking/Web/Browsers
-Url:            http://code.google.com/p/chromium/
+URL:            http://code.google.com/p/chromium/
 Source0:        http://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz
 Source1:        BUILD.gn
 Patch0:         chromium-last-commit-position-r0.patch
 Patch1:         chromium-dma-buf.patch
 Patch2:         chromium-angle.patch
 Patch3:         chromium-memcpy.patch
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
 BuildRequires:  ninja
+BuildRequires:  pkgconfig
 BuildRequires:  python-xml
 BuildRequires:  pkgconfig(dri)
 BuildRequires:  pkgconfig(gtk+-2.0)
@@ -44,7 +43,14 @@
 BuildRequires:  pkgconfig(python)
 BuildRequires:  pkgconfig(xscrnsaver)
 BuildRequires:  pkgconfig(xtst)
-ExclusiveArch:	%{ix86} x86_64
+ExclusiveArch:  %{ix86} x86_64
+%if %{?suse_version} >= 1330
+BuildRequires:  gcc >= 6.0
+BuildRequires:  gcc-c++ >= 6.0
+%else
+BuildRequires:  gcc7
+BuildRequires:  gcc7-c++
+%endif
 
 %description
 This package contains proprietary codecs needed for the HTML5
@@ -73,8 +79,8 @@
 export CXX=g++-7
 # some still call gcc/g++
 mkdir -p "$HOME/bin/"
-ln -sfn /usr/bin/$CC $HOME/bin/gcc
-ln -sfn /usr/bin/$CXX $HOME/bin/g++
+ln -sfn %{_bindir}/$CC $HOME/bin/gcc
+ln -sfn %{_bindir}/$CXX $HOME/bin/g++
 export PATH="$HOME/bin/:$PATH"
 %else
 export CC=gcc
@@ -115,7 +121,6 @@
 install -Dm0644 out/Release/libffmpeg.so %{buildroot}%{_libdir}/%{name}/libffmpeg.so
 
 %files
-%defattr(-,root,root)
 %doc AUTHORS LICENSE
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libffmpeg.so