From aaadd9c967effd29fc7c677a02440e867278f21f086228b4b0c1361c81023e62 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 3 Feb 2023 12:41:23 +0000 Subject: [PATCH 1/3] - Updated to 8.1 release - Windows version set to Windows 10 for new prefixes. - Many code cleanups that were deferred during code freeze. - Various bug fixes. - update staging to 8.1 release OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=977 --- wine-8.0.tar.xz | 3 --- wine-8.0.tar.xz.sign | 16 ---------------- wine-8.1.tar.xz | 3 +++ wine-8.1.tar.xz.sign | 16 ++++++++++++++++ wine-staging-8.0.tar.xz | 3 --- wine.changes | 9 +++++++++ wine.spec | 12 ++++++------ 7 files changed, 34 insertions(+), 28 deletions(-) delete mode 100644 wine-8.0.tar.xz delete mode 100644 wine-8.0.tar.xz.sign create mode 100644 wine-8.1.tar.xz create mode 100644 wine-8.1.tar.xz.sign delete mode 100644 wine-staging-8.0.tar.xz diff --git a/wine-8.0.tar.xz b/wine-8.0.tar.xz deleted file mode 100644 index c950dd7..0000000 --- a/wine-8.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0272c20938f8721ae4510afaa8b36037457dd57661e4d664231079b9e91c792e -size 29054044 diff --git a/wine-8.0.tar.xz.sign b/wine-8.0.tar.xz.sign deleted file mode 100644 index 2c7719a..0000000 --- a/wine-8.0.tar.xz.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmPP9RkACgkQzvrI6q8X -UZ3YFg//eT5KlrtuApnF2ovc7kWaGK+4Kd9YhKd9sWu0jOT1TQJVKnq1pUhvTEgU -CnN8xpL6584QXmKBH5l7P5cGZU0XOq4eAfQYcplzdZdxfvmBku0daN5J0vt37/0i -HI+04PVRj1MmXNUTyoXx/BEQvbihVhRD1U1ucjcm299VYunc5hHZEtN9rUzC35TE -ramNjwFiZSl9IsskgsjoOwsHOFNl0kRi4oPppe+bBk4lchkSu1QDyd+oSs3N3RKN -QcAOSabGh9G9v/+GNHM/7zmGLr4uzpjDFZX3lkGOINJ2vQQD0AC4OZq8q2EYi+t0 -5TdT1Hm8gYf+HzXLmv8zT3nECn4dBjb0Twg5ReBF56mpyIhpccHsKQ2xM7PVCmCK -M64Kru70RlApzT8D6Ni1b9PCAoft77lCYJJRqaiMPRojhQkL3eQkPWzy/6UG5HJm -/B1fVkoMckPVXRT0vJS7y9+tvxJEqjDFb2k27l0hX1X+KpO8KGeckcg4NaMMz4ZZ -ZsKJ7gd1pOb2uWXwLAhbyss4CBXrWyQvWV1+xk+g0cGtNW+bS8XS7wJt2csZC5h+ -DDGXX2kNtCwkDQMEXDF6AGnmLf9R8M4fn1Ng//KoJ9XW4Y+hkXSSRIwACn7qvNSz -KI8NAuUYWMIakCaQUQV6vFFwnWnDrdRkRtSzjSfUix4WDS2Dqac= -=E5Ba ------END PGP SIGNATURE----- diff --git a/wine-8.1.tar.xz b/wine-8.1.tar.xz new file mode 100644 index 0000000..b084fea --- /dev/null +++ b/wine-8.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4120ee6b3f294d97aaf2c73034cf1c2cbf13a195c94c5c74a646a81f92412598 +size 29083080 diff --git a/wine-8.1.tar.xz.sign b/wine-8.1.tar.xz.sign new file mode 100644 index 0000000..22f000b --- /dev/null +++ b/wine-8.1.tar.xz.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmPcKd0ACgkQzvrI6q8X +UZ2LXw//QlLJK+hWOzQ9LSL6u4mglPeGrENKERr9u217xDZnnwEkFGRb1hqlOLmT +t40dTJ+wee1F4PAYpC4YwnOZ601nMk9LBrKbcy3ccD7mp3MeRRuZmRW9pUGvp903 +eOVJakjo561jfXAw1aJcTfQEKITpvJx2tqnwYrPOhSV6LI4E78P6wmugIRpbEgvo +v5nxRU/ydt61b+2qtDGzNBi3aTqAeWjctedrpVnH2wckzukVqMgpzbNZANFbm7jk +ndYaTcg8OMjHrSEMUeLyDnd89vAVWBDnwOGtgQkh1lD56YZomRmk9CuA02DJ5D9l +RLafVm/DxrylRRYM7mciySUYD3i9JDQDqZDhE6eYfrqJOr+fM7K/Ehbm+tfKqi74 +xyIk+ZvSq1Jc640Yrqc6RcbltiMzRtwgFCc/lQlGKu/D95iWhaPtL4Al3vIKfFQZ ++8Xn7KoPLNbVDB7rHwQss7zy1rf5YbNVgfD4dy+0vUHzbJc9klU1QAOenijogmRM +SATDPwfCXAHGYt26uYGP2ssj84yrrTAdZP0HmKvCNF9UTOI7Ga56qnRAcKe0JKuY +6ghpUerdSXboS6wp4G9eFC5uVAsHqZiAPFNPSKBSkJU9YbS61LTxLTaDKA5ixb5Z +nYbtRZr4uZh9dZ8f0iH+j2L63Pk1sQcWiMJkhlmu2OTpmiexGEc= +=F27p +-----END PGP SIGNATURE----- diff --git a/wine-staging-8.0.tar.xz b/wine-staging-8.0.tar.xz deleted file mode 100644 index b0d5cff..0000000 --- a/wine-staging-8.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:068150c7af6aa67e9c47b19849b012e8576d4fb85f4d1efdd7ebcbf2b7a977e6 -size 7253108 diff --git a/wine.changes b/wine.changes index 8994fd4..9839333 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Feb 3 11:22:55 UTC 2023 - Marcus Meissner + +- Updated to 8.1 release + - Windows version set to Windows 10 for new prefixes. + - Many code cleanups that were deferred during code freeze. + - Various bug fixes. +- update staging to 8.1 release + ------------------------------------------------------------------- Tue Jan 24 16:08:58 UTC 2023 - Marcus Meissner diff --git a/wine.spec b/wine.spec index fe7dd31..1927cf7 100644 --- a/wine.spec +++ b/wine.spec @@ -1,5 +1,5 @@ # -# spec file for package wine +# spec file # # Copyright (c) 2023 SUSE LLC # @@ -29,8 +29,8 @@ %endif # needs to be on top due to usage of %version macro below -%define realver 8.0 -Version: 8.0 +%define realver 8.1 +Version: 8.1 Release: 0 %if "%{flavor}" != "" @@ -134,9 +134,9 @@ 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/8.0/%{projectname}-%{realver}.tar.xz +Source0: https://dl.winehq.org/wine/source/8.x/%{projectname}-%{realver}.tar.xz Source41: wine.keyring -Source42: https://dl.winehq.org/wine/source/8.0/%{projectname}-%{realver}.tar.xz.sign +Source42: https://dl.winehq.org/wine/source/8.x/%{projectname}-%{realver}.tar.xz.sign Source2: http://kegel.com/wine/wisotool Source3: README.SUSE Source4: wine.desktop @@ -164,7 +164,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 ppc armv7l armv7hl aarch64 %if %{staging} # upstream patch target version -%define staging_version 8.0 +%define staging_version 8.1 Source100: wine-staging-%{staging_version}.tar.xz BuildRequires: gtk3-devel BuildRequires: libOSMesa-devel From c013bca1e610a0a42ecd927a1f3cc196e68da1a134af85ac25931611ade7e6b5 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 5 Feb 2023 20:01:18 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=978 --- _service | 2 +- wine-staging-8.1.tar.xz | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 wine-staging-8.1.tar.xz diff --git a/_service b/_service index d977b46..5bc66a9 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ @PARENT_TAG@ v(.*) https://github.com/wine-staging/wine-staging.git - refs/tags/v8.0 + refs/tags/v8.1 v*.* git diff --git a/wine-staging-8.1.tar.xz b/wine-staging-8.1.tar.xz new file mode 100644 index 0000000..5a450d4 --- /dev/null +++ b/wine-staging-8.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:233dbd27cf30359f94d13cce47b0085ef3d0704b10a0ef64014d828ff9d4c4c4 +size 7246908 From f74ef24642ab77f82a17108bbd03b22a2f7d3948bf9a17fe08f2c7a143e3e498 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 9 Feb 2023 08:03:09 +0000 Subject: [PATCH 3/3] - require libvulkan_intel and libvulkan_radeon during installation, also in 32bit flavors. bsc#1206421 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=979 --- wine.changes | 6 ++++++ wine.spec | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/wine.changes b/wine.changes index 9839333..5b3fa87 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 9 08:02:33 UTC 2023 - Marcus Meissner + +- require libvulkan_intel and libvulkan_radeon during installation, + also in 32bit flavors. bsc#1206421 + ------------------------------------------------------------------- Fri Feb 3 11:22:55 UTC 2023 - Marcus Meissner diff --git a/wine.spec b/wine.spec index 1927cf7..9a281d1 100644 --- a/wine.spec +++ b/wine.spec @@ -80,6 +80,8 @@ BuildRequires: libxslt-devel %if 0%{?suse_version} >= 1330 BuildRequires: mpg123-devel BuildRequires: vulkan-devel +Requires: libvulkan_intel +Requires: libvulkan_radeon Provides: wine-mp3 = %version Obsoletes: wine-mp3 < %version %else @@ -309,6 +311,10 @@ echo " recommends \"alsa-plugins-pulse-32bit\"" >> %SOURCE7 echo " recommends \"alsa-plugins-32bit\"" >> %SOURCE7 echo " recommends \"Mesa-libGL1-32bit\"" >> %SOURCE7 %if 0%{?suse_version} >= 1330 +# indirect deps of libvulkan +echo " requires \"libvulkan_intel-32bit\"" >> %SOURCE7 +echo " requires \"libvulkan_radeon-32bit\"" >> %SOURCE7 +# now included echo " obsoletes \"wine-mp3-32bit\"" >> %SOURCE7 %else echo " recommends \"wine-mp3-32bit\"" >> %SOURCE7