Changes of Revision 10

chromium-ffmpeg-extra.spec Changed
x
 
1
@@ -1,7 +1,7 @@
2
 #
3
 # spec file for package chromium-ffmpeg-extra
4
 #
5
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
6
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
7
 #
8
 # All modifications and additions to the file contributed by third parties
9
 # remain the property of their copyright owners, unless otherwise agreed
10
@@ -20,18 +20,17 @@
11
 Version:        64.0.3282.134
12
 Release:        0
13
 Summary:        Extra ffmpeg codecs for browsers based on Chromium
14
-License:        BSD-3-Clause and LGPL-2.1+
15
+License:        BSD-3-Clause AND LGPL-2.1+
16
 Group:          Productivity/Networking/Web/Browsers
17
-Url:            http://code.google.com/p/chromium/
18
+URL:            http://code.google.com/p/chromium/
19
 Source0:        http://commondatastorage.googleapis.com/chromium-browser-official/chromium-%{version}.tar.xz
20
 Source1:        BUILD.gn
21
 Patch0:         chromium-last-commit-position-r0.patch
22
 Patch1:         chromium-dma-buf.patch
23
 Patch2:         chromium-angle.patch
24
 Patch3:         chromium-memcpy.patch
25
-BuildRequires:  gcc
26
-BuildRequires:  gcc-c++
27
 BuildRequires:  ninja
28
+BuildRequires:  pkgconfig
29
 BuildRequires:  python-xml
30
 BuildRequires:  pkgconfig(dri)
31
 BuildRequires:  pkgconfig(gtk+-2.0)
32
@@ -44,7 +43,14 @@
33
 BuildRequires:  pkgconfig(python)
34
 BuildRequires:  pkgconfig(xscrnsaver)
35
 BuildRequires:  pkgconfig(xtst)
36
-ExclusiveArch: %{ix86} x86_64
37
+ExclusiveArch:  %{ix86} x86_64
38
+%if %{?suse_version} >= 1330
39
+BuildRequires:  gcc >= 6.0
40
+BuildRequires:  gcc-c++ >= 6.0
41
+%else
42
+BuildRequires:  gcc7
43
+BuildRequires:  gcc7-c++
44
+%endif
45
 
46
 %description
47
 This package contains proprietary codecs needed for the HTML5
48
@@ -73,8 +79,8 @@
49
 export CXX=g++-7
50
 # some still call gcc/g++
51
 mkdir -p "$HOME/bin/"
52
-ln -sfn /usr/bin/$CC $HOME/bin/gcc
53
-ln -sfn /usr/bin/$CXX $HOME/bin/g++
54
+ln -sfn %{_bindir}/$CC $HOME/bin/gcc
55
+ln -sfn %{_bindir}/$CXX $HOME/bin/g++
56
 export PATH="$HOME/bin/:$PATH"
57
 %else
58
 export CC=gcc
59
@@ -115,7 +121,6 @@
60
 install -Dm0644 out/Release/libffmpeg.so %{buildroot}%{_libdir}/%{name}/libffmpeg.so
61
 
62
 %files
63
-%defattr(-,root,root)
64
 %doc AUTHORS LICENSE
65
 %dir %{_libdir}/%{name}
66
 %{_libdir}/%{name}/libffmpeg.so
67