Accepting request 658846 from Emulators

- Update to 4.0rc2 release candidate
  - bugfixes only
- updated staging to 4.0-rc2

- Update to 4.0rc1 release candidate
  - Preloader implemented on mac OS.
  - Mouse cursor support on Android.
  - Updates to the timezone database.
  - Vulkan support updated to the latest spec.
  - Stream I/O support in WebServices.
  - Better palette support in WindowsCodecs.
  - Synchronization objects support for kernel drivers.
  - Various bug fixes.
- updated staging to 4.0-rc1

- winetricks moved into its own package.

- require Mesa-libd3d and Mesa-libd3d-32bit for the "nine"
  flavors (bsc#1112026)

OBS-URL: https://build.opensuse.org/request/show/658846
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=268

_service

@@ -3,7 +3,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="url">https://github.com/wine-staging/wine-staging.git</param>
-    <param name="revision">refs/tags/v3.21</param>
+    <param name="revision">refs/tags/v4.0-rc2</param>
     <param name="match-tag">v*.*</param>
     <param name="scm">git</param>
   </service>
@@ -11,7 +11,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">wined3d9(.*)</param>
     <param name="url">https://github.com/sarnex/wine-d3d9-patches.git</param>
-    <param name="revision">refs/tags/wine-d3d9-3.20</param>
+    <param name="revision">refs/tags/wine-d3d9-3.21</param>
     <param name="scm">git</param>
   </service>
   <service name="recompress" mode="disabled">

wine-3.21.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a84cc06015df06e12c524213a98d879caa0d63f474b911cdd87f693fcfe2e0c0
-size 21573872

wine-3.21.tar.xz.sign

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlv4YFQACgkQzvrI6q8X
-UZ1DCA//auldWePakX4Ur/G+aIB+RGt12hju9E1TVwEhWXRpJ1t/JL3HiISMUltH
-CkncyDEWyMGXEHSv646VPNZ5+f03LEYyRaWce+sC34S01eBKigVuCOxlCS1iv6JN
-CNquRZA7kC1QyIa8pdmWdHxBKET0FKvP0/dl3g8iz3rxSoQM79tLfXhiHfIg9NfR
-4YT7YgFUXOHsq+eQffz+cEDx+LmdWLVXszDM8ySv9lh6sBxoeWY7M+CzrcWE/2+J
-HIQsafRb/9fxbuBVJG/vRejsrEOq6tgY9LCufr/ZgScIl3ayUBDkHQGQd0ZXKXFl
-X2EOB54SK7DSLxotbgII3m+sdyKAQcFBBQvKBArzQfsMjeyYv8oBnoQueP9qDU6p
-gIHfiHpx+0SjpIJQ7nksoAEPLEvyFahPRohF3picX6eOKNuHs4epKZnDBAdC0sIx
-PTmPx1M4NtsCXqbsm40LlRWce/Yd6NdfIxUmK5bRCx77ysmfwvggBgGEG7JZdNSj
-K6o8ONwixG+Idk47BNTnkMn7Lal/tZQ1NkzjLhCRgjQWafU483sOWAT6FTeEwXQw
-ga1+tJ/hy3drKtjuqNvi8VYE6KiIlOOx51mYCnJ2y1yK0JXwcKa0yyc8qfpDr8Tv
-W/ejoA5pdVQvHTvwxIB6KpdNcN7s0yIMinI5ZwcYHGUDYhMzxbY=
-=tG9d
------END PGP SIGNATURE-----

wine-4.0-rc2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c40ef35fc8ce128f49eaf25ff3e433f6f14e028857ce4f9859a6f830f556f82a
+size 21610464

wine-4.0-rc2.tar.xz.sign

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlwT7tEACgkQzvrI6q8X
+UZ2YcA/9GZBBJl4MRJkUZiFJu61uvlXftJyubQ2xSy0dFRqr9XQNrDiuuBdBRRZt
+pKlw93F2VajNTuSAXbKR4kiiFplYz6anCoaWtExrfJl3b5iWpcKg6SJWuUXYPR7G
+AbfHc1e0/5Wx6d7lpa24K0suileuJXfkFTGrrgxYFTxF+NOGe8GjFw+SxUC3U+7c
+R4goMq2pnMg2Vp7M7UntaVLCkvSgWcK42O3sWCgHUaDrygORDirRE1S0ATWcdsrT
+F0Z34EfNp8sN6vGEVvT6KoeiHUdsFhMDY8MTVg1QTU6jAD6z5uxhOGJAyMVRRrWT
+gEePeK14jAWC8Inw1qfIOx8HGxx2lbCAhOQVLWgIsq0ExCEoVXwzNvVeiIq3vUUY
+f8Pqr6PCrFDun0ezQ+3zKFkqzD1tfEOvSBnyiIY2ZT7un3aAIGoV0afOYEebv973
+CYr0UrOE2VGcSORnJhqTVNZ/Uba+H6UBv2rlCVn740QwA43+TNNQNK0Trf9PF4hI
+5WRafXC/pTzzE9ibGsOzstYBznkTLrvk9iRzTccHOHhw6OTlEVC4c+KC7SlwOCsi
+EID9xcU2ej8Kywut/8S7iIpgnSrSYwRjBMmciXaNfoiWGY7Ilfj5Wv5v6PQ40acr
+x1riAgek8ZNCghYxceao1IuJRf2C58MNFVfsfrWF0YdWrhRMGQo=
+=qOgB
+-----END PGP SIGNATURE-----

wine-d3d9-patches-3.20.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:224e40f5490b17e5d0149ed7c748ccf37f716241fc61e33ee4b00bad411dcc8d
-size 42292

wine-d3d9-patches-3.21.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:95b0dc1bfa402ee992788b06174fd7ef4af61e9197f86ef877b474b065a9afa4
+size 42272

wine-staging-3.21.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eaa08ac8abd5d9329eb6ea831623ccbc9d5857895ab66a937eb8495d4cc296b2
-size 7469036

wine-staging-4.0rc2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91085a6e55e8999f8fc2341bffad5f56dfe623efaf19e1193eafd0139ba79792
+size 7450596

wine.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Fri Dec 14 18:36:11 UTC 2018 - meissner@suse.com
+
+- Update to 4.0rc2 release candidate
+  - bugfixes only
+- updated staging to 4.0-rc2
+
+-------------------------------------------------------------------
+Sat Dec  8 08:46:56 UTC 2018 - meissner@suse.com
+
+- Update to 4.0rc1 release candidate
+  - Preloader implemented on mac OS.
+  - Mouse cursor support on Android.
+  - Updates to the timezone database.
+  - Vulkan support updated to the latest spec.
+  - Stream I/O support in WebServices.
+  - Better palette support in WindowsCodecs.
+  - Synchronization objects support for kernel drivers.
+  - Various bug fixes.
+- updated staging to 4.0-rc1
+
+-------------------------------------------------------------------
+Tue Dec  4 16:50:35 UTC 2018 - meissner@suse.com
+
+- winetricks moved into its own package.
+
+-------------------------------------------------------------------
+Thu Nov 29 13:55:38 UTC 2018 - meissner@suse.com
+
+- require Mesa-libd3d and Mesa-libd3d-32bit for the "nine"
+  flavors (bsc#1112026)
+
 -------------------------------------------------------------------
 Sat Nov 24 08:19:07 UTC 2018 - meissner@suse.com
 

wine.spec

@@ -107,18 +107,16 @@ BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xrender)
 BuildRequires:  pkgconfig(xxf86vm)
 BuildRequires:  pkgconfig(zlib)
-%define realver 3.21
+%define realver 4.0-rc2
-Version:        3.21
+Version:        4.0~rc2
 Release:        0
 Summary:        An MS Windows Emulator
 License:        LGPL-2.1-or-later
 Group:          System/Emulators/PC
 Url:            http://www.winehq.org/
-Source0:        https://dl.winehq.org/wine/source/3.x/%{projectname}-%{realver}.tar.xz
+Source0:        https://dl.winehq.org/wine/source/4.0/%{projectname}-%{realver}.tar.xz
 Source41:       wine.keyring
-Source42:       https://dl.winehq.org/wine/source/3.x/%{projectname}-%{realver}.tar.xz.sign
+Source42:       https://dl.winehq.org/wine/source/4.0/%{projectname}-%{realver}.tar.xz.sign
-Source1:        https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
-Source11:       https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks.1
 Source2:        http://kegel.com/wine/wisotool
 Source3:        README.SUSE
 Source4:        wine.desktop
@@ -134,19 +132,17 @@ Recommends:     wine-mono
 Recommends:     dosbox
 Recommends:     alsa-plugins
 Recommends:     alsa-plugins-pulse
+Recommends:     winetricks
 Requires:       samba-winbind
 Conflicts:      wine-gecko < 1.3
 %ifarch x86_64
 Requires:       %{name}-32bit = %{version}
 %endif
-# some recommends for winetricks:
-Recommends:     cabextract
-Recommends:     unzip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %{ix86} x86_64 ppc %arm aarch64
 %if %{staging}
 # upstream patch target version
-%define staging_version 3.21
+%define staging_version 4.0rc2
 Source100:      wine-staging-%{staging_version}.tar.xz
 BuildRequires:  gtk3-devel
 BuildRequires:  libOSMesa-devel
@@ -154,8 +150,9 @@ BuildRequires:  libva-devel
 %endif
 %if %{nine}
 # upstream patch target version
-%define nine_version 3.20
+%define nine_version 3.21
 BuildRequires:  Mesa-libd3d-devel
+Requires:       Mesa-libd3d
 BuildRequires:  libOSMesa-devel
 BuildRequires:  pkgconfig(dri2proto)
 Source110:      wine-d3d9-patches-%{nine_version}.tar.xz
@@ -279,6 +276,9 @@ echo " recommends \"wine-mp3-32bit\""		>> %SOURCE7
 %if 0%{?suse_version} >= 1310
 echo " requires \"p11-kit-32bit\""		>> %SOURCE7
 %endif
+%if %{nine}
+echo " requires \"Mesa-libd3d-32bit\""		>> %SOURCE7
+%endif
 %if "%{flavor}" != ""
 echo " provides \"wine-<targettype> = <version>\""		>> %SOURCE7
 %endif
@@ -301,14 +301,12 @@ install -d %{buildroot}%{_datadir}/applications/
 
 install -m 0644 %SOURCE4 %{buildroot}%{_datadir}/applications/
 install -m 0644 %SOURCE6 %{buildroot}%{_datadir}/applications/
-install -m 0755 %SOURCE1 %{buildroot}%{_bindir}/
 install -m 0755 %SOURCE2 %{buildroot}%{_bindir}/
 mv %{buildroot}/%{_mandir}/de.UTF-8 %{buildroot}/%{_mandir}/de
 mv %{buildroot}/%{_mandir}/fr.UTF-8 %{buildroot}/%{_mandir}/fr
 %ifnarch x86_64 aarch64
 mv %{buildroot}/%{_mandir}/pl.UTF-8 %{buildroot}/%{_mandir}/pl
 %endif
-install -pm0644 -c %{SOURCE11} %{buildroot}/%{_mandir}/man1/
 
 tar -xjf %{SOURCE5}
 # Copied from Ubuntu Wine out of debian.diff
@@ -382,7 +380,6 @@ chmod 755 %winedir/my-find-requires.sh
 %{_bindir}/winemine
 %{_bindir}/winepath
 %{_bindir}/wineserver
-%{_bindir}/winetricks
 %{_bindir}/wisotool
 %{_datadir}/wine
 %{_datadir}/applications/wine.desktop
@@ -408,7 +405,6 @@ chmod 755 %winedir/my-find-requires.sh
 %doc %{_mandir}/man1/winecpp.1.*
 %doc %{_mandir}/man1/winefile.1.*
 %doc %{_mandir}/man1/winemine.1.*
-%doc %{_mandir}/man1/winetricks.1.*
 %doc %{_mandir}/man1/winepath.1.*
 %dir %{_sysconfdir}/xdg/menus/
 %dir %{_sysconfdir}/xdg/menus/applications-merged

winetricks.1

@@ -1,182 +0,0 @@
-.\" -*- nroff -*-
-.TH WINETRICKS 1 "August 2018" "Winetricks 20180815" "Wine Package Manager"
-.SH NAME
-winetricks \- manage virtual Windows environments using Wine
-.SH SYNOPSIS
-.BI "winetricks "
-[options] [verb ... ]
-.SH DESCRIPTION
-.B winetricks
-is an easy way to work around common problems in Wine.
-.PP
-It provides simple commands to
-tweak Wine settings,
-download and install missing Windows DLLs and fonts,
-or install various games or apps with appropriate workarounds for the current version of Wine.
-.PP
-It can be used via GUI or command line.  The command-line mode is intended both for interactive use and as a building block in fancier Wine frontends and in automated regression testing.
-
-.B winetricks
-with no arguments displays a GUI using either Zenity or Kdialog.
-
-.SH OPTIONS
-.TP
-.B
-\-\-country=CC
-Set country code to CC and don't detect your IP address
-when retrying downloads
-.TP
-.B
-\-\-force
-Don't check whether packages were already installed
-.TP
-.B
-\-\-gui
-Show GUI diagnostics even when driven by the command-line interface
-.TP
-.B
-\-\-isolate
-Install each app or game in its own bottle
-.TP
-.B
-\-k, \-\-keep_isos
-Cache ISOs (allows later installation without disc)
-.TP
-.B
-\-\-no\-isolate
-Don't install each app or game in its own bottle (default)
-.TP
-.B
-\-\-no\-clean
-Don't delete temp directories (useful during debugging)
-.TP
-.B
-\-q, \-\-unattended
-Don't ask any questions, just install automatically
-.TP
-.B
-\-r, \-\-ddrescue
-Retry hard when caching scratched discs
-.TP
-.B
-\-\-showbroken
-Even show verbs that are currently broken in Wine
-.TP
-.B
-\-v, \-\-verbose
-Echo all commands as they are executed
-.TP
-.B
-\-h, \-\-help
-Display this message and exit
-.TP
-.B
-\-V, \-\-version
-Display version and exit
-
-.SH COMMANDS
-.TP
-.B
-apps list
-list verbs in category 'applications'
-.TP
-.B
-benchmarks list
-list verbs in category 'benchmarks'
-.TP
-.B
-dlls list
-list verbs in category 'dlls'
-.TP
-.B
-games list
-list verbs in category 'games'
-.TP
-.B
-list
-list categories
-.TP
-.B
-list-cached
-list cached-and-ready-to-install verbs
-.TP
-.B
-list-download
-list verbs which download automatically
-.TP
-.B
-list-manual-download
-list verbs which download with some help from the user
-.TP
-.B
-list-installed
-list already-installed verbs
-.TP
-.B
-prefix=foobar
-select WINEPREFIX=$HOME/.local/share/wineprefixes/foobar
-.TP
-.B
-settings list
-list verbs in category 'settings'
-
-.PP
-.SH EXAMPLES
-
-.TP
-To see list of available packages to install:
-winetricks list-download
-.TP
-To install a package:
-winetricks 7zip
-
-.SH ENVIRONMENT VARIABLES
-Wine checks several environment variables on startup:
-.TP
-.I WINE
-If set, this specifies which wine binary to use by default
-.TP
-.I WINESERVER
-If set, this specifies which wineserver to use by default
-.TP
-.I WINEPREFIX
-If set, this specifies the location of the default .wine directory ( usually
-.IR $HOME/.wine
-).
-.TP
-.I XDG_CACHE_HOME
-If set, this is path to system's user data cache (default: $HOME/.cache)
-.I W_CACHE
-path to Winetricks' user data cache (default: $XDG_CACHE_HOME/winetricks}
-
-.SH AUTHORS
-Dan Kegel, Austin English, and many others.  For a complete list,
-please see the "Copyright" section in the file 'winetricks'.
-
-.SH COPYRIGHT
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-See <https://www.gnu.org/licenses/>.
-.SH BUGS
-.PP
-Bugs may be reported at
-.I https://github.com/Winetricks/winetricks
-.PP
-.SH AVAILABILITY
-The most recent version of
-.B winetricks
-can be downloaded from
-.I https://github.com/Winetricks/winetricks/releases
-.PP
-The latest snapshot of the code may be obtained via git; see
-.I https://github.com/Winetricks/winetricks/
-.PP
-For further information about
-.B winetricks
-see
-.I https://github.com/Winetricks/winetricks/
-
-.SH "SEE ALSO"
-.BR wine (1)