[packages/vivaldi] remove snapshot from paths; bugfixes

[glen]

commit 38bc3720b8eb48d5703268f58fcad1ae338eecd7
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Sep 6 00:59:05 2015 +0300

    remove snapshot from paths; bugfixes

 bin.patch     | 30 ++++++++++++++++++++++++++++++
 desktop.patch | 15 +++++++++++++++
 vivaldi.spec  |  5 +++++
 3 files changed, 50 insertions(+)
---
diff --git a/vivaldi.spec b/vivaldi.spec
index b32829b..931713f 100644
--- a/vivaldi.spec
+++ b/vivaldi.spec
@@ -10,6 +10,8 @@ NoSource:	0
 Source1:	https://vivaldi.com/download/snapshot/%{name}-snapshot_%{version}-1_amd64.deb
 # NoSource1-md5:	b18994a388c83b98c7ccbb1755de103d
 NoSource:	1
+Patch0:		bin.patch
+Patch1:		desktop.patch
 URL:		https://vivaldi.com/
 BuildRequires:	hicolor-icon-theme
 BuildRequires:	tar >= 1:1.22
@@ -55,6 +57,9 @@ mv opt/%{name}-snapshot/* .
 mv %{name}{-snapshot,}
 mv usr/share/applications/vivaldi-snapshot.desktop %{name}.desktop
 
+%patch0 -p1
+%patch1 -p1
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins \
diff --git a/bin.patch b/bin.patch
new file mode 100644
index 0000000..f388485
--- /dev/null
+++ b/bin.patch
@@ -0,0 +1,30 @@
+--- vivaldi-1.0.252.3/vivaldi~	2015-08-21 05:26:28.000000000 +0300
++++ vivaldi-1.0.252.3/vivaldi	2015-09-06 00:56:58.047117862 +0300
+@@ -60,9 +60,9 @@
+ 
+ # Automagically migrate user data directory.
+ # TODO(phajdan.jr): Remove along with migration code in the browser for M33.
+-if [[ -n "${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi-snapshot" ]]; then
+-  if [[ ! -d "${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi-snapshot" ]]; then
+-    "$HERE/vivaldi-bin" "--migrate-data-dir-for-sxs=${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi-snapshot" \
++if [[ -n "${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi" ]]; then
++  if [[ ! -d "${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi" ]]; then
++    "$HERE/vivaldi-bin" "--migrate-data-dir-for-sxs=${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi" \
+       --enable-logging=stderr --log-level=0
+   fi
+ fi
+@@ -94,12 +94,12 @@
+ # overrides the default.
+ if [[ -n "$CHROME_USER_DATA_DIR" ]]; then
+   # Note: exec -a below is a bashism.
+-  exec -a "$0" "$HERE/vivaldi-bin" --user-data-dir="${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi-snapshot" \
++  exec -a "$0" "$HERE/vivaldi-bin" --user-data-dir="${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi" \
+     --user-data-dir="$CHROME_USER_DATA_DIR" \
+     --ppapi-flash-path=$FLASH_PATH --ppapi-flash-version=$FLASH_VERSION \
+     "$@"
+ else
+-  exec -a "$0" "$HERE/vivaldi"-bin --user-data-dir="${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi-snapshot" \
++  exec -a "$0" "$HERE/vivaldi"-bin --user-data-dir="${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi" \
+     --ppapi-flash-path=$FLASH_PATH --ppapi-flash-version=$FLASH_VERSION \
+     "$@"
+ fi
diff --git a/desktop.patch b/desktop.patch
new file mode 100644
index 0000000..bc64701
--- /dev/null
+++ b/desktop.patch
@@ -0,0 +1,15 @@
+--- vivaldi-1.0.252.3/vivaldi.desktop~	2015-08-21 05:26:28.000000000 +0300
++++ vivaldi-1.0.252.3/vivaldi.desktop	2015-09-06 00:58:22.987958860 +0300
+@@ -105,9 +105,9 @@
+ Comment[zh_CN]=访问互联网
+ Comment[zh_HK]=連線到網際網路
+ Comment[zh_TW]=連線到網際網路
+-Exec=/usr/bin/vivaldi-snapshot %U
++Exec=/usr/bin/vivaldi %U
+ Terminal=false
+-Icon=vivaldi-snapshot
++Icon=vivaldi
+ Type=Application
+ Categories=Network;WebBrowser;
+-MimeType=text/html;text/xml;application/xhtml_xml;image/webp;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
++MimeType=text/html;text/xml;application/xhtml+xml;image/webp;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vivaldi.git/commitdiff/a0a6d2fb1a6adabd9aa3f35bf28b398a9016d6d4