From 4f85e44acd21550cd773ef5df29dd26bcfd3650d3c4a9a5cb33597d25b5bbd34 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 12 Sep 2020 05:16:31 +0000 Subject: [PATCH 1/5] - Updated to 5.17 development release - ADVAPI32 library converted to PE. - Beginnings of an NDIS network driver. - Still more restructuration of the console support. - Various bug fixes. - update staging to 5.17 release OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=752 --- _service | 2 +- wine-5.16.tar.xz | 3 --- wine-5.16.tar.xz.sign | 16 ---------------- wine-5.17.tar.xz | 3 +++ wine-5.17.tar.xz.sign | 16 ++++++++++++++++ wine-staging-5.16.tar.xz | 3 --- wine-staging-5.17.tar.xz | 3 +++ wine.changes | 10 ++++++++++ wine.spec | 6 +++--- 9 files changed, 36 insertions(+), 26 deletions(-) delete mode 100644 wine-5.16.tar.xz delete mode 100644 wine-5.16.tar.xz.sign create mode 100644 wine-5.17.tar.xz create mode 100644 wine-5.17.tar.xz.sign delete mode 100644 wine-staging-5.16.tar.xz create mode 100644 wine-staging-5.17.tar.xz diff --git a/_service b/_service index 386be29..f99fec5 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ @PARENT_TAG@ v(.*) https://github.com/wine-staging/wine-staging.git - refs/tags/v5.16 + refs/tags/v5.17 v*.* git diff --git a/wine-5.16.tar.xz b/wine-5.16.tar.xz deleted file mode 100644 index 4a92193..0000000 --- a/wine-5.16.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98d9a62f89e20a8f1321aadd4183229aab47ca5b2f12c7e0968cf81634322249 -size 24025256 diff --git a/wine-5.16.tar.xz.sign b/wine-5.16.tar.xz.sign deleted file mode 100644 index 9b9ef42..0000000 --- a/wine-5.16.tar.xz.sign +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAl9JZlkACgkQzvrI6q8X -UZ3bUw/+NjgU+wwoy/YuPPL3RTTyLJndDRB4kxErnYEsHxCknR6NGq/nJIm6sH+o -Hck+INN7EedQAfZFmoqpnLw1VHsXhTyBQmUE6phsX3d/hNQgVPUg+aUFoI1L1NRH -Xul3HUtBA5Tyw0kZazqZvJqwWPbCpzY9Yn7AhZ1zN9K9iMNMAtJaKc81nsXjHl2/ -TeYBfE2G9n70hA86bKzXSiq57+gnifhgcLvDXiGUr0Pi5YMLY+0kIXrfLqYI2hi8 -6LXir9ZKO3oEOOSKU8gCDEjx9JVjhG7Oj0yNBqiuSYuwXJ3U4fmhqaxNLFvVMdHg -xR9R8y01w1wCr0xcrBLifJZgJ78K3XxnLysKmeQgaqpdfKOw9iBqquMBg/qHg8o0 -o+QLlFipUeXIX7a/IR3bwYSi5BcNlOJJR1GWvrEwOednr3Z+DqcrSA8fFAQb37aI -vJ4XXoBcejf69hEfbkYfRuFVkLtXyCLH3+gBO1jDduRq7jYon1zfeYTKmkP3ojkD -Xk8mmGGo+HQb0rE0bMN2H3XkJcPgRaYWngvtxb8tt6gpJ785vZ3O1/KzrHN5D4IU -JHHb7Pf6Cf7yrJeIo8p1RbAYakK4H2N34fIsKMp0dRkhzbhsYAmn1wwzwTOOpqDI -GHwTgrZYqB8X9mwXxpdFiBq4vRi/nXwn2zlAQQ6xrLocmX0XKxc= -=5XF4 ------END PGP SIGNATURE----- diff --git a/wine-5.17.tar.xz b/wine-5.17.tar.xz new file mode 100644 index 0000000..dd4db57 --- /dev/null +++ b/wine-5.17.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6438bd01314838131010b0a6e8c04f413bdd890cd10e69ba3e199d0090a1e4f +size 24064512 diff --git a/wine-5.17.tar.xz.sign b/wine-5.17.tar.xz.sign new file mode 100644 index 0000000..05b0935 --- /dev/null +++ b/wine-5.17.tar.xz.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAl9b1PsACgkQzvrI6q8X +UZ2bDw/+LSldj/uVlO2OzSb9TcRKTAepjGEBD8YOybVZqKvuJH0al528BkMFwjxx +kQn8TPHK0frR6RgdpjlgRMMXx+/mHPoX9pqMqz4C2hWU+sK6j46PnQnZlZdfPeHw +Ii83izfm0R/ncdpUSLdjcWljHlQJXUv2zyOihI6TaEHN2XPTwmsdbhjKGWIo1NNI +uS9DST4RtbL/JMYTiAisfUyJ33V5vRki+J6pe8sqJ1IKL72PLy8HXJUEVaB/5XOL +xKZQcQeOcg/VmrmflhakpuBcjIFRKzuJfpCVIoUoeq8GoCCxKdRFDtK+QnHBYJoC +Tw4g/0jCHvoUggH9Py6JJP0DJ2U82f2pbg0MJKrAOR1jEVDjZCWiG80UQfoYPoVB +H5ei5COyS0Vu6u+tOf4n6bFz2osq/9eJQ8AMl89yvUsKZYvSSGEiR6BZJZrxkEWF +vqSPaxTgRhn5Bg8wKz09HzFTO0f6Qt4wm8DpeUjSIx1/oSe6t6YY263gkDUbkjJC +d7yVomiLjdDvGHltXOUTjOslNCqBOf1mZFUcDvpX6gI6GuPv6TsFGaiVKjxhW79r +RDWWfabhm6N1C/BVIEW9meYQtGIjC6M7eNDsfJAxNBv66a6UOQ/9cK2dhnIr1xvg +u1fhN12t/ADhOloIJNraTI93sK0ijbXKaj0tuIHDHVpURFCz3ek= +=uwd4 +-----END PGP SIGNATURE----- diff --git a/wine-staging-5.16.tar.xz b/wine-staging-5.16.tar.xz deleted file mode 100644 index 21a2c46..0000000 --- a/wine-staging-5.16.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9a97e612643d519e17bc26a7109969f6d9fbba3d21a6380b9296d645a51db67 -size 7383976 diff --git a/wine-staging-5.17.tar.xz b/wine-staging-5.17.tar.xz new file mode 100644 index 0000000..b40f3c1 --- /dev/null +++ b/wine-staging-5.17.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54ce43f75dad54104e9c2b47e26cd430c7ac0ea1035a741e1d35bab757658a89 +size 7514516 diff --git a/wine.changes b/wine.changes index 645fcc7..2569bfd 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Sep 12 05:15:53 UTC 2020 - Marcus Meissner + +- Updated to 5.17 development release + - ADVAPI32 library converted to PE. + - Beginnings of an NDIS network driver. + - Still more restructuration of the console support. + - Various bug fixes. +- update staging to 5.17 release + ------------------------------------------------------------------- Mon Sep 7 16:12:39 UTC 2020 - Guillaume GARDET diff --git a/wine.spec b/wine.spec index f119917..e57e035 100644 --- a/wine.spec +++ b/wine.spec @@ -29,8 +29,8 @@ %endif # needs to be on top due to usage of %version macro below -%define realver 5.16 -Version: 5.16 +%define realver 5.17 +Version: 5.17 Release: 0 %if "%{flavor}" != "" @@ -158,7 +158,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %{ix86} x86_64 ppc armv7l armv7hl aarch64 %if %{staging} # upstream patch target version -%define staging_version 5.16 +%define staging_version 5.17 Source100: wine-staging-%{staging_version}.tar.xz BuildRequires: gtk3-devel BuildRequires: libOSMesa-devel From a3e4dc266524e72dfc3c076a82795983d636f2fb2889b86eb73c8d23bc5241fc Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 12 Sep 2020 10:51:48 +0000 Subject: [PATCH 2/5] rfemove fdupes again OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=753 --- wine.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/wine.spec b/wine.spec index e57e035..9a0beb4 100644 --- a/wine.spec +++ b/wine.spec @@ -376,8 +376,6 @@ chmod 755 %winedir/my-find-requires.sh # breaks btrfs installation, see bnc#723402 # %%fdupes -s %{buildroot} -# Fix dups on aarch64 -%fdupes -s %{buildroot}%{_libdir}/wine/fakedlls %post -p /sbin/ldconfig %postun -p /sbin/ldconfig From a446766460f8e30c4c44741de017b14db0a7e31bf296b62117cbc890096750d3 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 12 Sep 2020 14:29:25 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=754 --- baselibs.conf | 1 + wine.spec | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/baselibs.conf b/baselibs.conf index ea7cd05..927a523 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -28,3 +28,4 @@ wine requires "libGL.so.1" requires "libGLU.so.1" wine-devel +libwine1 diff --git a/wine.spec b/wine.spec index 9a0beb4..723b160 100644 --- a/wine.spec +++ b/wine.spec @@ -214,6 +214,24 @@ Conflicts: otherproviders(wine-devel) This RPM contains the header files and development tools for the WINE libraries. +%if "%{flavor}" != "" +%package -n libwine1-%{flavor} +%else +%package -n libwine1 +%endif +%if "%{flavor}" != "" +Provides: libwine1 = %{version} +%endif +Conflicts: otherproviders(libwine1) + +%if "%{flavor}" != "" +%description -n libwine1-%{flavor} +%else +%description -n libwine1 +%endif +This RPM contains the header files and development tools for the WINE +libraries. + %prep %setup -q -n wine-%{realver} #patch0 -p1 @@ -308,6 +326,14 @@ echo " +^/usr/lib/wine/.*def" >> %SOURCE7 echo " provides \"wine-devel- = \"" >> %SOURCE7 %endif echo " conflicts \"otherproviders(wine-devel-)\"" >> %SOURCE7 + +%if "%{flavor}" != "" +echo "libwine1-%{flavor}" >> %SOURCE7 +echo " provides \"libwine1- = \"" >> %SOURCE7 +%else +echo "libwine1" >> %SOURCE7 +%endif +echo " conflicts \"otherproviders(libwine1-)\"" >> %SOURCE7 cat %SOURCE7 %endif make %{?_smp_mflags} all @@ -471,11 +497,19 @@ chmod 755 %winedir/my-find-requires.sh %ifnarch %arm aarch64 %{_libdir}/wine/*.tlb %endif -%{_libdir}/lib*.so.* %dir %{_libdir}/wine %dir %{_libdir}/wine/fakedlls %{_libdir}/wine/fakedlls/* +%if "%{flavor}" != "" +%files -n libwine1-%{flavor} +%else +%files -n libwine1 +%endif +%defattr(-,root,root) +%license LICENSE LICENSE.OLD +%{_libdir}/lib*.so.* + %files devel %defattr(-,root,root) %{_includedir}/wine From 3eda22b33c1349230ad8bfbb91213914018ba0403a7c6abf2274f1eaa4cea5c1 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 12 Sep 2020 14:37:34 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=755 --- wine.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wine.spec b/wine.spec index 723b160..04c7a96 100644 --- a/wine.spec +++ b/wine.spec @@ -219,6 +219,8 @@ libraries. %else %package -n libwine1 %endif +Summary: The Wine shared library +Group: System/Emulators/PC %if "%{flavor}" != "" Provides: libwine1 = %{version} %endif From 82e21fc1602e7b2fd1db9b3c56e4b15ec89324a8e291cbcfd2f0ef63110ee454 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 12 Sep 2020 16:52:36 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=756 --- baselibs.conf | 1 - wine-rpmlintrc | 2 ++ wine.spec | 35 ----------------------------------- 3 files changed, 2 insertions(+), 36 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 927a523..ea7cd05 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -28,4 +28,3 @@ wine requires "libGL.so.1" requires "libGLU.so.1" wine-devel -libwine1 diff --git a/wine-rpmlintrc b/wine-rpmlintrc index 4424dc2..c18c8eb 100644 --- a/wine-rpmlintrc +++ b/wine-rpmlintrc @@ -1,2 +1,4 @@ # Some of our .a files are data only, rpmlint check does not cover that addFilter("lto-no-text-in-archive") +# we have a libwine.so.1, but it is really just for wine usage only. +addFilter("shlib-policy-name-error") diff --git a/wine.spec b/wine.spec index 04c7a96..ef7440f 100644 --- a/wine.spec +++ b/wine.spec @@ -214,26 +214,6 @@ Conflicts: otherproviders(wine-devel) This RPM contains the header files and development tools for the WINE libraries. -%if "%{flavor}" != "" -%package -n libwine1-%{flavor} -%else -%package -n libwine1 -%endif -Summary: The Wine shared library -Group: System/Emulators/PC -%if "%{flavor}" != "" -Provides: libwine1 = %{version} -%endif -Conflicts: otherproviders(libwine1) - -%if "%{flavor}" != "" -%description -n libwine1-%{flavor} -%else -%description -n libwine1 -%endif -This RPM contains the header files and development tools for the WINE -libraries. - %prep %setup -q -n wine-%{realver} #patch0 -p1 @@ -329,13 +309,6 @@ echo " provides \"wine-devel- = \"" >> %SOURCE7 %endif echo " conflicts \"otherproviders(wine-devel-)\"" >> %SOURCE7 -%if "%{flavor}" != "" -echo "libwine1-%{flavor}" >> %SOURCE7 -echo " provides \"libwine1- = \"" >> %SOURCE7 -%else -echo "libwine1" >> %SOURCE7 -%endif -echo " conflicts \"otherproviders(libwine1-)\"" >> %SOURCE7 cat %SOURCE7 %endif make %{?_smp_mflags} all @@ -502,14 +475,6 @@ chmod 755 %winedir/my-find-requires.sh %dir %{_libdir}/wine %dir %{_libdir}/wine/fakedlls %{_libdir}/wine/fakedlls/* - -%if "%{flavor}" != "" -%files -n libwine1-%{flavor} -%else -%files -n libwine1 -%endif -%defattr(-,root,root) -%license LICENSE LICENSE.OLD %{_libdir}/lib*.so.* %files devel