Request 3734 (accepted)

This request supersedes: request 3733 (Show diff)

Overview

Request 3734 (accepted)

- Seach in chromium for libffmpeg
- Remove code for obsolete suse_version
- Handle also SLE_12
- Ignore rpmlint during build

Created by olh over 8 years ago
In state accepted
Supersedes 3733

Submit vivaldi

Submit package home:olh:branches:Extra / vivaldi to package Extra / vivaldi

vivaldi.changes Changed

vivaldi.spec Changed

@@ -20,10 +20,8 @@
 %if 0%{?packman_bs}
 %define pepper_flash_lib %(rpm -ql chromium-pepper-flash | grep "flashplayer.so")
 %define pepper_flash_ver %(grep -ao -m1 "LNX [,0-9]\+" %{pepper_flash_lib} | sed 's/[^0-9]\+//;s/,/./g')
-%if 0%{?is_opensuse}
-%define codecs_dir %(rpm -ql chromium-ffmpeg | grep -m1 "\.so" | xargs dirname)
-%define codecs_ver %(rpm -q --qf '%{VERSION}' chromium-ffmpeg | awk 'BEGIN{FS="."}{print $1 * 1000000 + $2 * 1000 + $3}')
-%endif
+%define codecs_dir %(rpm -ql chromium | grep -m1 "\.so" | xargs dirname)
+%define codecs_ver %(rpm -q --qf '%{VERSION}' chromium | awk 'BEGIN{FS="."}{print $1 * 1000000 + $2 * 1000 + $3}')
 %endif
 Name:           vivaldi
 Version:        1.7.735.46
@@ -39,27 +37,21 @@
 Patch0:         vivaldi-1.6.689.46_launcher.patch
 BuildRequires:  build
 BuildRequires:  chrpath
+BuildRequires:  chromium
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  update-desktop-files
 Recommends:     chromium-pepper-flash
 Recommends:     chromium-plugin-widevinecdm
-Suggests:       chromium-ffmpeg
+Suggests:       chromium
 Conflicts:      vivaldi-stable
 ExclusiveArch:	%ix86 x86_64
 %if 0%{?packman_bs}
 BuildRequires:  chromium-pepper-flash
-%if 0%{?suse_version} == 1320 || 0%{?suse_version} == 1310
-BuildRequires:  chromium-ffmpeg
-%ifarch x86_64
-BuildRequires:  chromium-plugin-widevinecdm
-%endif
-%endif
 %endif
-%ifarch %ix86
 # Not enough memory for rpmlint
-BuildRequires:  -rpmlint-Factory
-%endif
+#!BuildIgnore:  rpmlint-Factory
+#!BuildIgnore:  rpmlint-mini
 
 %description
 Vivaldi browser is made with power users in mind by people who love the Web.
@@ -79,7 +71,7 @@
 
 for file in opt/%{name}/%{name} %{name}.config.in; do
     sed -e 's|@LIBDIR@|%{_libdir}|g' \
-        -e 's|@PKG_FFMPEG@|chromium-ffmpeg|g' \
+        -e 's|@PKG_FFMPEG@|chromium|g' \
         -e 's|@VIVALDI_CONFIG@|%{_sysconfdir}/default/%{name}|g' \
         -e 's|@VIVALDI_FLAGS@|--disable-setuid-sandbox|g' \
         -e 's|@VIVALDI_SANDBOX_FILE@|%{name}-sandbox|g' \

vivaldi-1.6.689.46_launcher.patch Changed

Build Results
RPM Lint

Refresh

Comments for request 3734 0

Request History

olh created request over 8 years ago

- Seach in chromium for libffmpeg
- Remove code for obsolete suse_version
- Handle also SLE_12
- Ignore rpmlint during build

awissu accepted request over 8 years ago

Please add a comment