Projects
Extra
vivaldi
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 22
View file
vivaldi.changes
Changed
@@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Mar 20 17:49:10 UTC 2017 - olaf@aepfle.de + +- Seach in chromium for libffmpeg +- Remove code for obsolete suse_version +- Handle also SLE_12 +- Ignore rpmlint during build + +------------------------------------------------------------------- Wed Feb 8 11:41:22 UTC 2017 - avvissu@yandex.by - Update to 1.7.735.46:
View file
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' \
View file
vivaldi-1.6.689.46_launcher.patch
Changed
@@ -84,7 +84,7 @@ - ln -fs "$LIBFFMPEG_PATH/libffmpeg.so" "$VIVALDI_LOCAL_LIBS/libffmpeg.so" +CODECS_DIR="$(rpm -ql @PKG_FFMPEG@ | grep -m1 "\.so" | xargs dirname)" +if [[ -n "$CODECS_DIR" && -d "$CODECS_DIR" ]]; then -+ CODECS_VERSION="$(rpm -q --qf '%{VERSION}' chromium-ffmpeg | awk 'BEGIN{FS="."}{print $1 * 1000000 + $2 * 1000 + $3}')" ++ CODECS_VERSION="$(rpm -q --qf '%{VERSION}' chromium | awk 'BEGIN{FS="."}{print $1 * 1000000 + $2 * 1000 + $3}')" + if [[ -n "$CODECS_VERSION" && "$CODECS_VERSION" -ge "48002564" ]]; then + FFMPEG_LD_LIBRARY_PATH=":$CODECS_DIR" fi
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.