Packman Build Service PMBS

vivaldi.changes Changed

vivaldi.spec Changed

@@ -15,8 +15,12 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$
 %global __requires_exclude ^.*(ffmpeg|widevinecdm).*$
+%if 0%{?suse_version} == 1320
+%{!?is_opensuse:%global is_opensuse 1}
+%endif
 %if 0%{?packman_bs}
 %if 0%{?is_opensuse}
 %define codecs_dir %(rpm -ql chromium-ffmpeg | grep -m1 "\.so" | xargs dirname)
@@ -75,19 +79,23 @@
 
 %patch0 -p1
 
-for file in opt/%{name}/%{name} %{SOURCE2}; do
+cp %{SOURCE2} .
+
+for file in opt/%{name}/%{name} %{name}.config.in; do
     sed -e 's|@LIBDIR@|%{_libdir}|g' \
         -e 's|@VIVALDI_CONFIG@|%{_sysconfdir}/default/%{name}|g' \
         -e 's|@CODECS_DIR@|%{?codecs_dir}|g' \
         -e 's|@CODECS_VER@|%{?codecs_ver}|g' \
         -e 's|@PEPPER_FLASH_LIB@|%{?pepper_flash_lib}|g' \
+        -e 's|@VIVALDI_FLAGS@|--disable-setuid-sandbox|g' \
         -e 's|@VIVALDI_SANDBOX_FILE@|\./%{name}-sandbox|g' \
-        -e 's|@VIVALDI_USER_FLAGS@|--disable-setuid-sandbox|g' \
         -i $file
 done
 
-find . \
--name \*.desktop -exec sed -i '/Exec\|Binaries/s/$=$.*[a-z]/\1%{name}/' {} \;
+find . -name \*.desktop | while read file; do
+    sed -i '/Exec\|Binaries/s/$=$.*[a-z]/\1%{name}/' $file
+    mv $file %{name}.desktop
+done
 
 %build
 # Nothing to build.
@@ -96,11 +104,11 @@
 install -d \
     %{buildroot}%{_bindir} \
     %{buildroot}%{_libdir} \
-    %{buildroot}%{_datadir}/{,/xfce4}
+    %{buildroot}%{_datadir}
 
 cp -a usr %{buildroot}
 cp -a {opt/,%{buildroot}%{_libdir}/}%{name}
-install -Dm0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/default/%{name}
+install -Dm0644 %{name}.config.in %{buildroot}%{_sysconfdir}/default/%{name}
 
 pushd %{buildroot}
 # Create a new symlink
@@ -109,7 +117,7 @@
         ln -s %{_libdir}/%{name}/%{name} .%{_bindir}/%{name}
     fi
 
-# Remove the setuid from sandbox
+# Remove the setuid on sandbox
     if [ -u .%{_libdir}/%{name}/%{name}-sandbox ]; then
         chmod u-s .%{_libdir}/%{name}/%{name}-sandbox
     fi
@@ -133,6 +141,8 @@
     popd
 popd
 
+%suse_update_desktop_file -i %{name}
+
 # Get a list of files
 filelist=$PWD/%{name}.lst
 pushd %{buildroot}
@@ -140,7 +150,7 @@
         file=$(echo $list | sed 's/[^/]//')
         dir=$(dirname $file)
         if echo $dir | grep "%{name}\|xfce4"; then
-            grep -wqs "%dir\ $dir" $filelist || echo "%dir $dir"  >> $filelist
+            grep -wqs "\%dir\ $dir" $filelist || echo "%dir $dir"  >> $filelist
         fi
         [ -d "$list" ] || echo $file >> $filelist
     done
@@ -148,10 +158,10 @@
 
 # Create COPYING
 strings \
-$(find . -type f -name "en-US.pak") | \
-sed -n '/^.h.*Vivaldi/,/.\/body./p' | \
-sed 's/.\/ol.$/\n/;s/<[^>]*>//g' | \
-fold -s > COPYING
+$(find . -type f -name "en-US.pak") \
+| sed -n '/^.h.*Vivaldi/,/.\/body./p' \
+| sed 's/.\/ol.$/\n/;s/<[^>]*>//g' \
+| fold -s > COPYING
 
 %fdupes %{buildroot}%{_libdir}
 
@@ -175,6 +185,6 @@
 %files -f %{name}.lst
 %defattr(-,root,root)
 %doc COPYING
-%config(noreplace) %{_sysconfdir}/default/%{name}
+%config %{_sysconfdir}/default/%{name}
 
 %changelog

vivaldi-stable-1.2.490.43_run.patch Changed

@@ -1,6 +1,6 @@
 diff -U 3 -dHrN vivaldi-stable-1.2.490.43.orig/opt/vivaldi/vivaldi vivaldi-stable-1.2.490.43/opt/vivaldi/vivaldi
 --- vivaldi-stable-1.2.490.43.orig/opt/vivaldi/vivaldi	2016-07-11 11:02:13.391676192 +0300
-+++ vivaldi-stable-1.2.490.43/opt/vivaldi/vivaldi	2016-07-11 12:42:32.884752531 +0300
++++ vivaldi-stable-1.2.490.43/opt/vivaldi/vivaldi	2016-07-11 15:46:00.414527994 +0300
 @@ -9,25 +9,25 @@
  
  HERE="`dirname "$CHROME_WRAPPER"`"
@@ -12,13 +12,13 @@
 +# Check for existence of needed config file
 +VIVALDI_CONF_FILE="@VIVALDI_CONFIG@"
 +if which zenity &> /dev/null; then
-+    MESSAGE="$(which zenity)"
++    xMESSAGE="$(which zenity)"
 +elif which gmessage &> /dev/null; then
-+    MESSAGE="$(which gmessage)"
++    xMESSAGE="$(which gmessage)"
 +elif which xmessage &> /dev/null; then
-+    MESSAGE="$(which xmessage)"
++    xMESSAGE="$(which xmessage)"
 +else
-+    MESSAGE="echo"
++    xMESSAGE="echo"
 +fi
 +test -r $VIVALDI_CONF_FILE
  if [ $? != 0 ]; then
@@ -34,7 +34,7 @@
 -    echo "$SSE2_DEPRECATION_MSG" 1>&2
 -  fi
 -  exit 1
-+    $MESSAGE "$VIVALDI_CONF_FILE not existing."
++    $xMESSAGE "$VIVALDI_CONF_FILE not existing."
 +    exit 1
  fi
  
@@ -57,7 +57,7 @@
 +if [ -n "$CHR_CODECS_DIR" ] && [ -d "$CHR_CODECS_DIR" ]; then
 +  CHR_CODECS_VER="@CODECS_VER@"
 +  if [ -n "$CHR_CODECS_VER" ]; then
-+    if [[ "$CHR_CODECS_VER" =~ "51.0.2704" ]] || [[ "$CHR_CODECS_VER" =~ "50.0.2661" ]] || [[ "$CHR_CODECS_VER" =~ "49.0.2623" ]]; then
++    if [[ "$CHR_CODECS_VER" =~ '51.0.2704' ]] || [[ "$CHR_CODECS_VER" =~ '50.0.2661' ]] || [[ "$CHR_CODECS_VER" =~ '49.0.2623' ]]; then
 +        FFMPEG_LD_LIBRARY_PATH=":$CHR_CODECS_DIR"
 +    fi
    fi
@@ -76,7 +76,7 @@
  fi
  export LD_LIBRARY_PATH
  
-@@ -73,37 +77,41 @@
+@@ -73,37 +77,45 @@
  exec > >(exec cat)
  exec 2> >(exec cat >&2)
  
@@ -97,7 +97,7 @@
 -elif [ -f "/usr/lib64/chromium-browser/PepperFlash/libpepflashplayer.so" ]; then
 -  FLASH_PATH="/usr/lib64/chromium-browser/PepperFlash/libpepflashplayer.so" # rosa/mandriva 64-bit
 +FLASH_PATH="@PEPPER_FLASH_LIB@"
-+if [ -n "$FLASH_PATH" ] && [-f "$FLASH_PATH" ]; then
++if [ -n "$FLASH_PATH" ] && [ -f "$FLASH_PATH" ]; then
 +  FLASH_PATH="$FLASH_PATH"
 +elif [ -f "@LIBDIR@/chromium/PepperFlash/libpepflashplayer.so" ]; then
 +  FLASH_PATH="@LIBDIR@/chromium/PepperFlash/libpepflashplayer.so"
@@ -107,21 +107,25 @@
  fi
  
 +# The setuid permission set on sandbox
-+if [[ "$VIVALDI_USER_FLAGS" =~ 'enable-setuid-sandbox' ]] && [[ ! "$VIVALDI_USER_FLAGS" =~ 'disable-setuid-sandbox' ]]; then
-+    VIVALDI_USER_FLAGS=$(echo $VIVALDI_USER_FLAGS | sed 's/--enable-setuid-sandbox//')
++VIVALDI_FLAGS="${VIVALDI_USER_FLAGS:-$VIVALDI_FLAGS}"
++if [[ "$VIVALDI_FLAGS" =~ 'enable-setuid-sandbox' ]] && [[ ! "$VIVALDI_FLAGS" =~ 'disable-setuid-sandbox' ]]; then
++    VIVALDI_FLAGS=$(echo $VIVALDI_FLAGS | sed 's/--enable-setuid-sandbox\ \?//')
 +    if [[ ! -u @VIVALDI_SANDBOX_FILE@ ]]; then
 +        if which xdg-su &> /dev/null; then
-+            $MESSAGE "Setting the setgid permission on sandbox"
++            $xMESSAGE "Setting the setgid permission on sandbox"
 +            xdg-su -c "chmod u+s @VIVALDI_SANDBOX_FILE@" &> /dev/null
 +        fi
 +    fi
 +elif [[ -u @VIVALDI_SANDBOX_FILE@ ]]; then
 +    if which xdg-su &> /dev/null; then
-+        $MESSAGE "Removing the setgid permission on sandbox"
++        $xMESSAGE "Removing the setgid permission on sandbox"
 +        xdg-su -c "chmod u-s @VIVALDI_SANDBOX_FILE@" &> /dev/null
 +    fi
 +fi
 +
++export VIVALDI_USER_FLAGS="$VIVALDI_FLAGS"
++export VIVALDI_USER_DATA_DIR="${VIVALDI_USER_DATA_DIR:-$VIVALDI_DATA_DIR}"
++
  # Make sure that the profile directory specified in the environment, if any,
  # overrides the default.
 -if [[ -n "$CHROME_USER_DATA_DIR" ]]; then

vivaldi.config.in Changed

Changes of Revision 7