diff --git a/_multibuild b/_multibuild index 636b806..68cabdc 100644 --- a/_multibuild +++ b/_multibuild @@ -1,5 +1,5 @@ nine - + staging + staging-nine diff --git a/wine-d3d9-patches-2.20.tar.xz b/wine-d3d9-patches-2.20.tar.xz deleted file mode 100644 index 4794ab0..0000000 --- a/wine-d3d9-patches-2.20.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33e42128cce101d409b16c893d7e52a80f6797d860a29d90a259199e3ba6a6b0 -size 40848 diff --git a/wine-d3d9-patches-3.3.tar.xz b/wine-d3d9-patches-3.3.tar.xz new file mode 100644 index 0000000..92364be --- /dev/null +++ b/wine-d3d9-patches-3.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ede0c407d68bc677d5108565657945311f4d8e5d0f60e05e49ddc2cf29a9ca11 +size 42412 diff --git a/wine-staging-2.21.tar.xz b/wine-staging-2.21.tar.xz deleted file mode 100644 index c4e7be6..0000000 --- a/wine-staging-2.21.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5df468532ada7ff8713cf31a186f80e19cdf16fb913974a8989c2c86c3428373 -size 7730272 diff --git a/wine-staging-3.3.tar.gz b/wine-staging-3.3.tar.gz new file mode 100644 index 0000000..df9a742 --- /dev/null +++ b/wine-staging-3.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6b3a36b9a148e3af7b961ee45d82a24d5667b4ac161415a8f6e0070b1d8865a +size 10136486 diff --git a/wine.changes b/wine.changes index 8f4e8f4..e078766 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 5 08:52:57 UTC 2018 - mimi.vx@gmail.com + +- update wine-staging and wine-nine to 3.3 +- enable wine staging + ------------------------------------------------------------------- Fri Mar 2 18:49:34 UTC 2018 - meissner@suse.com diff --git a/wine.spec b/wine.spec index aec850a..bd5d90a 100644 --- a/wine.spec +++ b/wine.spec @@ -85,7 +85,7 @@ BuildRequires: pkgconfig(libudev) Version: 3.3 Release: 0 Summary: An MS Windows Emulator -License: LGPL-2.1+ +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 @@ -120,15 +120,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 ppc %arm %if %{staging} # upstream patch target version -%define staging_version 2.21 -Source100: wine-staging-%{staging_version}.tar.xz +%define staging_version 3.3 +Source100: https://github.com/wine-staging/wine-staging/archive/v%{staging_version}.tar.gz#!./wine-staging-%{staging_version}.tar.gz BuildRequires: gtk3-devel BuildRequires: libOSMesa-devel BuildRequires: libva-devel %endif %if %{nine} # upstream patch target version -%define nine_version 2.20 +%define nine_version 3.3 BuildRequires: Mesa-libd3d-devel BuildRequires: dri2proto-devel BuildRequires: libOSMesa-devel