diff --git a/_service b/_service
index 75c1419..d291d6e 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
@PARENT_TAG@
v(.*)
https://github.com/wine-staging/wine-staging.git
- refs/tags/v6.7
+ refs/tags/v6.8
v*.*
git
diff --git a/wine-6.7.tar.xz b/wine-6.7.tar.xz
deleted file mode 100644
index e78fb71..0000000
--- a/wine-6.7.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c30514b7761d4611514ae021cb1e354128d77eff54a283f1401ee702277bbea4
-size 24449368
diff --git a/wine-6.7.tar.xz.sign b/wine-6.7.tar.xz.sign
deleted file mode 100644
index cff4b83..0000000
--- a/wine-6.7.tar.xz.sign
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmCDK+UACgkQzvrI6q8X
-UZ0pahAAijLJWiUMykaS1+lKBYsNbZFcUuiJcriwBatngi78GknnI2S6EV2BT5SM
-nuYRJ9dL7owRfMjVPEe79V4jWzXI+9m9W0gTyGdZTOj9b9Zu28j22WQAWejsFIpw
-sO0NO+rhdt5Twnzm+keG+yTEmwZ21MYV+C6DqYn938XPWGHW9l5+Z2a9uHGl0u/P
-/twrJQg0Sh9AOP8mETYR3MMDK4wiAnG8qaGWRx2Iq6VtJb9dNQ52YYAGLefWutuv
-S6RgWHiw2iuGjBp92cwSo1lI2ppjMbcSfhWVlPzLCs1uFJlh+k39tKsTgCazNoDY
-gkOnWol2u3c9xY7ACnb4DA6GJk2Wdr+HMIYPjIsc6M4utSqBhaeYE6eZ0xX8xoKo
-tjdWzJm0Sm114bwrt0R8P7iDojAYz4VjwC+oE95n9lXLtopdGsa2iw4lx9gtoanA
-+/s+JkZUObbEojUdVR3tfFfe+JHuX/nucJCQeBQnq5dkh4fKCgTR4KcNyyvO9quX
-BSH6+YTCF6VopOCjVNdihV3YmLndP9S4hs6fv/+b1olkVkBnkpDNCvIY5cZkRxK2
-MIiIl0WTyQadUk21roYeYkbO/Yf88bSWO+XeE5sYO3FI+d16LVXKJLlL/cfp9VBR
-H7HfrvwAJ3wEPFfDAb0iD/SO3wwFLvrxPvHxb26O/6NPOxW32IU=
-=MUKO
------END PGP SIGNATURE-----
diff --git a/wine-6.8.tar.xz b/wine-6.8.tar.xz
new file mode 100644
index 0000000..2d2209f
--- /dev/null
+++ b/wine-6.8.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5b422dde67d8412871152ce315875efb494507ad38a0f4d710f13938a769ebd8
+size 24481304
diff --git a/wine-6.8.tar.xz.sign b/wine-6.8.tar.xz.sign
new file mode 100644
index 0000000..62baaa0
--- /dev/null
+++ b/wine-6.8.tar.xz.sign
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmCVpf8ACgkQzvrI6q8X
+UZ2HXQ//cBXcIb3mQ5TCh3lHQ9ef/fGlI8cwKIttwGhnT80sYG5u3TLkZa/yArcb
+FIRqWypdcPX5Ea0q0agQcz2ZZGGH0TKR2+Ixu1lvLi0zWWiGPpSKkoUPub2W9clB
+MgMmr1TJgTpeUQ5o29pHm1IXY8PNHw2esZa5LhHR5oQ2xBg1DJfvHEn0jCysBDAp
+d/Rvi9ZiuT1mK0w+iG8CGrmgd/HYwfEwckMPtCAWYaZOpDCZv60RzGrWn8ieYUrg
+dIjHXDobQOll2Zm31VUL5CGlJHzKb7uJm9lXLFYoeeI2iiq9/pW70sFYHL9qRJQc
+/y7g6HLaotTsFuMp0aZolgMrQX/kEMt0VpDvswigYZ5k8faY21VtvEJiBF61k8OJ
+IKErSCjMzz8lU13tT/sU+9XhBu9RzJUWxlaEM6KCjpAJbCybgYWOsU4YBmE/oqTQ
+Fpn1ehCOXgCAx3wQGQnEjP4pn8PuXKlCcpNadReilbiH+nCaDFSWs1sTTwRPhuQd
+LSLPGv/sx5MJmjBt/h/AXajTj9D+iWEqHqxM8TkBbrC4oaR/rXtm+AexEhsJ8MtS
+Qr2jGng1mqwRmBeHzRjDVZAdtp7bJ8BVBYrdSvbB4VWQuYwuuGNvxEv6A+p+GpbC
+fFPxvGCqhvMs3nFB7lAC1yNbDKNknIZEXjc97zLnab2P8wl8Vi0=
+=ay5X
+-----END PGP SIGNATURE-----
diff --git a/wine-staging-6.7.tar.xz b/wine-staging-6.7.tar.xz
deleted file mode 100644
index 07796ac..0000000
--- a/wine-staging-6.7.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bd2d6e88c2e34eea52393cba52afe605bb42047fe38cf7a378923875a8bf5071
-size 7374208
diff --git a/wine-staging-6.8.tar.xz b/wine-staging-6.8.tar.xz
new file mode 100644
index 0000000..347dcda
--- /dev/null
+++ b/wine-staging-6.8.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:133c7a437eea996aa8bb83fd203019f6051ff821906162d6c87e8ae688bd15de
+size 7369024
diff --git a/wine.changes b/wine.changes
index 0403594..70a472b 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat May 8 12:56:00 UTC 2021 - Marcus Meissner
+
+- updated to 6.8 development release
+ - Libraries installed into architecture-specific subdirectories.
+ - Secur32 library converted to PE.
+ - Support for Map object in JavaScript.
+ - Various bug fixes.
+- update staging to 6.8 release
+
-------------------------------------------------------------------
Sat Apr 24 08:16:43 UTC 2021 - Marcus Meissner
diff --git a/wine.spec b/wine.spec
index 836a6bf..b24a828 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1,5 +1,5 @@
#
-# spec file for package wine
+# spec file for package wine%{?flavor:-}%{?flavor}
#
# Copyright (c) 2021 SUSE LLC
#
@@ -29,8 +29,8 @@
%endif
# needs to be on top due to usage of %version macro below
-%define realver 6.7
-Version: 6.7
+%define realver 6.8
+Version: 6.8
Release: 0
%if "%{flavor}" != ""
@@ -146,9 +146,9 @@ Recommends: wine-mono >= 6.1.1
Conflicts: wine-mono < 6.1.1
# not packaged in distro...
Recommends: wine-mono
-Recommends: dosbox
Recommends: alsa-plugins
Recommends: alsa-plugins-pulse
+Recommends: dosbox
Recommends: winetricks
Requires: samba-winbind
%ifarch x86_64
@@ -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 6.7
+%define staging_version 6.8
Source100: wine-staging-%{staging_version}.tar.xz
BuildRequires: gtk3-devel
BuildRequires: libOSMesa-devel
@@ -279,8 +279,8 @@ echo "# autogenerated in .spec file" >%SOURCE7
echo "%name" >> %SOURCE7
echo " +^/usr/bin/wine\$" >> %SOURCE7
echo " +^/usr/bin/wine-preloader\$" >> %SOURCE7
-echo " +^/usr/lib/wine/fakedlls" >> %SOURCE7
-echo " +^/usr/lib/wine/*" >> %SOURCE7
+echo " +^/usr/lib/wine/i386-windows" >> %SOURCE7
+echo " +^/usr/lib/wine/i386-unix" >> %SOURCE7
grep SONAME_ config.log
grep SONAME_ config.log|grep -v 'so"'|sed -e 's/^.*\(".*"\).*$/ requires \1/;'|sort -u >>%SOURCE7
echo " recommends \"libpulse0-32bit\"" >> %SOURCE7
@@ -384,7 +384,7 @@ chmod 755 %winedir/my-find-requires.sh
%files
%defattr(-,root,root)
%license LICENSE LICENSE.OLD
-%doc ANNOUNCE AUTHORS README*
+%doc ANNOUNCE AUTHORS README*
%{_bindir}/function_grep.pl
%{_bindir}/msidb
%{_bindir}/msiexec
@@ -429,7 +429,7 @@ chmod 755 %winedir/my-find-requires.sh
%config %{_sysconfdir}/xdg/menus/applications-merged/*.menu
%{_datadir}/applications/*.desktop
%dir %{_datadir}/desktop-directories/
-%{_datadir}/desktop-directories/*.directory
+%{_datadir}/desktop-directories/*.directory
%dir %{_datadir}/icons/hicolor
%dir %{_datadir}/icons/hicolor/scalable
%dir %{_datadir}/icons/hicolor/scalable/apps
@@ -445,40 +445,13 @@ chmod 755 %winedir/my-find-requires.sh
%{_bindir}/wine64
%{_bindir}/wine64-preloader
%endif
-%{_libdir}/wine/*.so
-%if 0%{?suse_version} >= 1550
-%ifnarch %arm aarch64
-%{_libdir}/wine/*.acm
-%{_libdir}/wine/*.ax
-%{_libdir}/wine/*.com
-%{_libdir}/wine/*.cpl
-%{_libdir}/wine/*.dll
-%endif
-%ifarch %ix86
-%{_libdir}/wine/*.dll16
-%{_libdir}/wine/*.drv16
-%{_libdir}/wine/*.exe16
-%{_libdir}/wine/*.mod16
-%{_libdir}/wine/*.vxd
-%endif
-%ifnarch %arm aarch64
-%{_libdir}/wine/*.drv
-%{_libdir}/wine/*.exe
-%{_libdir}/wine/*.ocx
-%{_libdir}/wine/*.sys
-%endif
-%endif
-%ifnarch %arm aarch64
-%if 0%{?suse_version} > 1500
-%{_libdir}/wine/*.tlb
-%else
-%{_libdir}/wine/*.tlb.so
-%endif
-%endif
%dir %{_libdir}/wine
-%dir %{_libdir}/wine/fakedlls
-%{_libdir}/wine/fakedlls/*
-%{_libdir}/lib*.so.*
+%dir %{_libdir}/wine/*-windows
+%{_libdir}/wine/*-windows/*.[b-z]*
+%{_libdir}/wine/*-windows/*.ax
+%{_libdir}/wine/*-windows/*.acm
+%dir %{_libdir}/wine/*-unix
+%{_libdir}/wine/*-unix/*.so*
%files devel
%defattr(-,root,root)
@@ -492,8 +465,14 @@ chmod 755 %winedir/my-find-requires.sh
%{_bindir}/winemaker
%{_bindir}/wmc
%{_bindir}/wrc
-%{_libdir}/wine/*.def
-%{_libdir}/wine/*.a
+%dir %{_libdir}/wine/*-unix
+%{_libdir}/wine/*-unix/*.a
+%{_libdir}/wine/*-unix/*.def
+%if 0%{?suse_version} >= 1550
+# only generated with mingw
+%dir %{_libdir}/wine/*-windows
+%{_libdir}/wine/*-windows/*.a
+%endif
%doc %{_mandir}/man1/winemaker.1*
%doc %{_mandir}/*/man1/winemaker.1*
%doc %{_mandir}/man1/widl.1*