Merge branch 'master' into rosa2016.1

This commit is contained in:
survolog (Andrey Grigorev) 2020-04-29 15:32:20 +03:00
commit 89b55456b5
2 changed files with 6 additions and 3 deletions

View file

@ -2,7 +2,7 @@ sources:
icons-4.0.tar.xz: 3063b6fcf8d9aeedcb9ecaab9c522bed88a21c0a
rosa-wine-desktop-4.4.1.tar.xz: 299d6a589af1e4db705f0e09190a8b388bb74b95
wine-5.0.tar.xz: d225098b2923808b2e73072ec20b81763e3ad7a5
wine-5.6.tar.xz: e016b5aad7a4bc106d0f2cb8910c534d3041bdf5
wine-5.7.tar.xz: 8551eb9f5ca467833351568658c65c5eee43f2f3
wine-nine-standalone-0.5.tar.gz: 7d24bac66d34493a725b1c47d7570daf60788532
wine-staging-5.6.1.tar.gz: 2131ad673ff042edbc48a1366331a0c9c369fc92
wine-staging-5.7.tar.gz: 4378c2774811a42c95be95fee4afe1b6784d28e1
winetricks-20200412.tar.gz: ccf36402a3dd754f67f0b1fc7401dcc882a409aa

View file

@ -9,7 +9,7 @@
%bcond_without systemd
# wine-staging tarball version
%define stagver 5.6.1
%define stagver 5.7
# wine-stable tarball version
%define stabver 5.0
@ -109,6 +109,7 @@ BuildRequires: imagemagick
# This is needed to build nine-standalone
BuildRequires: meson
BuildRequires: opencl-headers
BuildRequires: openjade
BuildRequires: prelink
BuildRequires: sgml-tools
BuildRequires: valgrind
@ -241,6 +242,7 @@ native Unix executables.
%{_datadir}/wine/nls/l_intl.nls
%{_datadir}/wine/nls/norm*.nls
%{_datadir}/wine/nls/sortdefault.nls
%{_datadir}/wine/wineusb.inf
%else
%{_datadir}/wine/l_intl.nls
%endif
@ -481,6 +483,7 @@ from the 32-bit repository to be able to run 32-bit applications.
%{_datadir}/wine/nls/l_intl.nls
%{_datadir}/wine/nls/norm*.nls
%{_datadir}/wine/nls/sortdefault.nls
%{_datadir}/wine/wineusb.inf
%else
%{_datadir}/wine/l_intl.nls
%endif