Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2016-04-28 16:54:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wine" Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2016-04-05 10:43:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2016-04-28 16:57:04.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Apr 15 15:05:02 UTC 2016 - [email protected] + +- Updated to 1.9.8 development snapshot + - More work towards the WineD3D command stream. + - Bug fix update of the Mono engine. + - More WebServices reader support. + - Still more Shader Model 5 support. + - Support for gradients in metafiles. + - Improved table formatting in WinHelp. + - Various bug fixes. +- updated winetricks + +------------------------------------------------------------------- Old: ---- wine-1.9.7.tar.bz2 wine-1.9.7.tar.bz2.sign New: ---- wine-1.9.8.tar.bz2 wine-1.9.8.tar.bz2.sign ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.KrJ5LA/_old 2016-04-28 16:57:07.000000000 +0200 +++ /var/tmp/diff_new_pack.KrJ5LA/_new 2016-04-28 16:57:07.000000000 +0200 @@ -53,8 +53,8 @@ BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel -%define realver 1.9.7 -Version: 1.9.7 +%define realver 1.9.8 +Version: 1.9.8 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ ++++++ wine-1.9.7.tar.bz2 -> wine-1.9.8.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/wine/wine-1.9.7.tar.bz2 /work/SRC/openSUSE:Factory/.wine.new/wine-1.9.8.tar.bz2 differ: char 11, line 1 ++++++ winetricks ++++++ --- /var/tmp/diff_new_pack.KrJ5LA/_old 2016-04-28 16:57:08.000000000 +0200 +++ /var/tmp/diff_new_pack.KrJ5LA/_new 2016-04-28 16:57:08.000000000 +0200 @@ -614,6 +614,68 @@ dn_status=$? } +# Checks if the user can run the self-update/rollback commands +winetricks_check_update_availability() +{ + # Prevents the development file overwrite: + if test -d "../.git" + then + w_warn "You're running in a dev environment. Please make a copy of the file before running this command." + exit; + fi + + # Checks read/write permissions on update directories + if ! (test -r $0 && test -w $0 && test -w ${0%/*} && test -x ${0%/*}) + then + w_warn "You don't have the proper permissions to run this command. Try again with sudo or as root." + exit; + fi +} + +winetricks_selfupdate() +{ + winetricks_check_update_availability + + _W_filename="${0##*/}" + _W_rollback_file="${0}.bak" + _W_update_file="${0}.update" + + _W_tmpdir=${TMPDIR:-/tmp} + _W_tmpdir="`mktemp -d "$_W_tmpdir/$_W_filename.XXXXXXXX"`" + + w_download_to $_W_tmpdir https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks + w_try mv $_W_tmpdir/$_W_filename $_W_update_file.gz + w_try gunzip $_W_update_file.gz + w_try rmdir $_W_tmpdir + + w_try cp $0 $_W_rollback_file + w_try chmod -x $_W_rollback_file + + w_try mv $_W_update_file $0 + w_try chmod +x $0 + + w_warn "Update finished! The current version is '`$0 -V`'. Use 'winetricks --update-rollback' to return to the previous version." + + exit; +} + +winetricks_selfupdate_rollback() +{ + winetricks_check_update_availability + + _W_rollback_file="${0}.bak" + + if test -f $_W_rollback_file + then + w_try mv $_W_rollback_file $0 + w_try chmod +x $0 + w_warn "Rollback finished! The current version is '`$0 -V`'." + else + w_warn "Nothing to rollback." + fi + exit; +} + # Download a file # Usage: w_download_to packagename url [sha1sum [filename [cookie jar]]] # Caches downloads in winetrickscache/$packagename @@ -709,7 +771,7 @@ *) torify= ;; esac - if [ -x "$(which aria2c 2>/dev/null)" ] && [ ! "$WINETRICKS_OPT_TORIFY" ] + if [ -x "$(which aria2c 2>/dev/null)" ] then # (Slightly fancy) aria2c support # See https://github.com/Winetricks/winetricks/issues/612 @@ -720,9 +782,14 @@ # --save-session='' if the user has specified save-session in their config, their session will be # ovewritten by the new aria2 process # http-accept-gzip=true (still needed) ? - # Note: torify is broken with aria2c, see https://github.com/tatsuhiro-t/aria2/issues/153 - aria2c --continue --daemon=false --dir "$_W_cache" --enable-rpc=false --input-file='' \ - --max-connection-per-server=5 --out "$_W_file" --save-session='' --stream-piece-selector=geom "$_W_url" + + # torify needs --async-dns=false, see https://github.com/tatsuhiro-t/aria2/issues/613 + case $WINETRICKS_OPT_TORIFY in + 1) torify aria2c --async-dns=false --continue --daemon=false --dir "$_W_cache" --enable-rpc=false --input-file='' \ + --max-connection-per-server=5 --out "$_W_file" --save-session='' --stream-piece-selector=geom "$_W_url" ;; + *) aria2c --continue --daemon=false --dir "$_W_cache" --enable-rpc=false --input-file='' \ + --max-connection-per-server=5 --out "$_W_file" --save-session='' --stream-piece-selector=geom "$_W_url" ;; + esac elif [ -x "`which wget 2>/dev/null`" ] then # Use -nd to insulate ourselves from people who set -x in WGETRC @@ -4294,6 +4361,8 @@ --force Don't check whether packages were already installed --gui Show gui diagnostics even when driven by commandline --isolate Install each app or game in its own bottle (WINEPREFIX) + --self-update Update this application to the last version + --update-rollback Rollback the last self update -k, --keep_isos Cache isos (allows later installation without disc) --no-clean Don't delete temp directories (useful during debugging) -q, --unattended Don't ask any questions, just install automatically @@ -4335,6 +4404,8 @@ -V|--version) winetricks_print_version ; exit 0;; --verify) WINETRICKS_VERIFY=1 ;; -h|--help) winetricks_usage ; exit 0 ;; + --self-update) winetricks_selfupdate;; + --update-rollback) winetricks_selfupdate_rollback;; --isolate) WINETRICKS_OPT_SHAREDPREFIX=0 ;; --no-isolate) WINETRICKS_OPT_SHAREDPREFIX=1 ;; --no-clean) W_OPT_NOCLEAN=1 ;;
