diff --git a/_attribute b/_attribute
index 232972c..a6669fe 100644
--- a/_attribute
+++ b/_attribute
@@ -55,7 +55,7 @@
boo#1171556: '20200511'
boo#1171714: '20200602'
boo#1171870: '20200517'
- boo#1172013: '20200815'
+ boo#1172013: '20200816'
boo#1172071: '20200523'
boo#1172291: '20200528'
boo#1172430: '20200810'
@@ -78,7 +78,7 @@
boo#1174797: '20200805'
boo#1175108: '20200815'
boo#1175238: '20200815'
- boo#1175317: '20200815'
+ boo#1175317: '20200816'
bsc#1158994: '20200323'
bsc#1159185: '20200103'
bsc#1170555: '20200427'
@@ -120,7 +120,7 @@
poo#63775: '20200222'
poo#63778: '20200301'
poo#63880: '20200226'
- poo#63892: '20200815'
+ poo#63892: '20200816'
poo#63910: '20200307'
poo#64069: '20200229'
poo#64102: '20200314'
@@ -163,7 +163,7 @@
poo#69703: '20200806'
poo#69706: '20200806'
poo#69709: '20200806'
- poo#69967: '20200815'
+ poo#69967: '20200816'
poo#69994: '20200815'
poo#70090: '20200815'
@@ -209,7 +209,7 @@ bad-rpmlint-entries = suse-dbus-unauthorized-service suse-pam-unauthorized-modul
s/openSUSE-/openSUSE-Staging:$LETTER-/
- 20200816
+ 20200817
arch: x86_64
@@ -390,10 +390,10 @@ test_subproject: ToTest
set_snapshot_number: True
- failed: ''
+ failed: '20200816'
published: '20200815'
publishing: '20200815'
-testing: '20200815'
+testing: '20200816'
diff --git a/_config b/_config
index adfd53f..298def5 100644
--- a/_config
+++ b/_config
@@ -453,62 +453,405 @@ Prefer: eclipse-swt
Prefer: wine-32bit wine-devel-32bit wine-devel
# 32bit -devel packages contain .pc files and cause a 'have choice' for OBS. unfavor the -32bit variants
-Prefer: -gdk-pixbuf-devel-32bit
-Prefer: -libgnutls-devel-32bit
-Prefer: -libgbm-devel-32bit
-Prefer: -libxml2-devel-32bit
-Prefer: -libXau-devel-32bit
-Prefer: -libicu-devel-32bit
-Prefer: -libxslt-devel-32bit
-Prefer: -wayland-devel-32bit
-Prefer: -flac-devel-32bit
-Prefer: -freetype2-devel-32bit
-Prefer: -libICE-devel-32bit
-Prefer: -libSM-devel-32bit
-Prefer: -hunspell-devel-32bit
-Prefer: -pciutils-devel-32bit
-Prefer: -libart_lgpl-devel-32bit
-Prefer: -libcelt-devel-32bit
-Prefer: -tslib-devel-32bit
-Prefer: -augeas-devel-32bit
-Prefer: -libXdmcp-devel-32bit
-Prefer: -libtasn1-devel-32bit
-Prefer: -libfontenc-devel-32bit
-Prefer: -cyrus-sasl-devel-32bit
-Prefer: -lzo-devel-32bit
-Prefer: -liblcms2-devel-32bit
-Prefer: -libexif-devel-32bit
-Prefer: -libnl3-devel-32bit
-Prefer: -libvorbis-devel-32bit
-Prefer: -libraw1394-devel-32bit
-Prefer: -Mesa-libGL-devel-32bit
-Prefer: -Mesa-libEGL-devel-32bit
-Prefer: -Mesa-libGLESv2-devel-32bit
-Prefer: -Mesa-libGLESv1_CM-devel-32bit
-Prefer: -Mesa-libGLESv1-devel-32bit
-Prefer: -libqt5-qttools-devel-32bit
-Prefer: -libqt5-qtwebengine-devel-32bit
-Prefer: -libcom_err-devel-32bit
-Prefer: -libverto-devel-32bit
-Prefer: -libuuid-devel-32bit
-Prefer: -libmount-devel-32bit
-Prefer: -libbz2-devel-32bit
-Prefer: -zlib-devel-32bit
-Prefer: -libexpat-devel-32bit
-Prefer: -libblkid-devel-32bit
-Prefer: -libgcrypt-devel-32bit
-Prefer: -popt-devel-32bit
-Prefer: -xz-devel-32bit
-Prefer: -libelf-devel-32bit
-Prefer: -ncurses-devel-32bit
-Prefer: -libnettle-devel-32bit
-Prefer: -libtiff-devel-32bit
-Prefer: -libattr-devel-32bit
-Prefer: -keyutils-devel-32bit
-Prefer: -libacl-devel-32bit
-Prefer: -libext2fs-devel-32bit
-Prefer: -audit-devel-32bit
-
+Prefer: -ColPack-devel-32bit
+Prefer: -FAudio-devel-32bit
+Prefer: -ImageMagick-devel-32bit
+Prefer: -Mesa-libd3d-devel-32bit
+Prefer: -Mesa-libglapi-devel-32bit
+Prefer: -NetworkManager-devel-32bit
+Prefer: -aalib-devel-32bit
+Prefer: -adolc-devel-32bit
+Prefer: -alsa-devel-32bit
+Prefer: -alsa-topology-devel-32bit
+Prefer: -armadillo-devel-32bit
+Prefer: -arpack-ng-devel-32bit
+Prefer: -at-spi2-core-devel-32bit
+Prefer: -atk-devel-32bit
+Prefer: -atkmm-devel-32bit
+Prefer: -atkmm1_6-devel-32bit
+Prefer: -attica-qt5-devel-32bit
+Prefer: -audiofile-devel-32bit
+Prefer: -audit-devel-32bit
+Prefer: -augeas-devel-32bit
+Prefer: -bind-devel-32bit
+Prefer: -binutils-devel-32bit
+Prefer: -blas-devel-32bit
+Prefer: -bluez-devel-32bit
+Prefer: -cairo-devel-32bit
+Prefer: -cairomm-devel-32bit
+Prefer: -cairomm1_0-devel-32bit
+Prefer: -cblas-devel-32bit
+Prefer: -chmlib-devel-32bit
+Prefer: -clang10-devel-32bit
+Prefer: -clang7-devel-32bit
+Prefer: -clang8-devel-32bit
+Prefer: -clang9-devel-32bit
+Prefer: -cppunit-devel-32bit
+Prefer: -cracklib-devel-32bit
+Prefer: -cups-devel-32bit
+Prefer: -cyrus-sasl-devel-32bit
+Prefer: -dante-devel-32bit
+Prefer: -dapl-devel-32bit
+Prefer: -dbus-1-devel-32bit
+Prefer: -dbus-1-glib-devel-32bit
+Prefer: -device-mapper-devel-32bit
+Prefer: -dirac-devel-32bit
+Prefer: -ecryptfs-utils-devel-32bit
+Prefer: -file-devel-32bit
+Prefer: -flac-devel-32bit
+Prefer: -fltk-devel-32bit
+Prefer: -fontconfig-devel-32bit
+Prefer: -frameworkintegration-devel-32bit
+Prefer: -freeglut-devel-32bit
+Prefer: -freetype2-devel-32bit
+Prefer: -gd-devel-32bit
+Prefer: -gdbm-devel-32bit
+Prefer: -gdk-pixbuf-devel-32bit
+Prefer: -giflib-devel-32bit
+Prefer: -glib2-devel-32bit
+Prefer: -glibc-devel-32bit
+Prefer: -glu-devel-32bit
+Prefer: -gmp-devel-32bit
+Prefer: -grantlee5-devel-32bit
+Prefer: -gstreamer-devel-32bit
+Prefer: -gstreamer-plugins-base-devel-32bit
+Prefer: -gtk2-devel-32bit
+Prefer: -gtk3-devel-32bit
+Prefer: -gtk4-devel-32bit
+Prefer: -hdf5-devel-32bit
+Prefer: -hdf5-mvapich2-devel-32bit
+Prefer: -hdf5-openmpi1-devel-32bit
+Prefer: -hdf5-openmpi2-devel-32bit
+Prefer: -hdf5-openmpi3-devel-32bit
+Prefer: -hdf5-openmpi4-devel-32bit
+Prefer: -hunspell-devel-32bit
+Prefer: -isl-devel-32bit
+Prefer: -jbig2dec-devel-32bit
+Prefer: -kaccounts-integration-devel-32bit
+Prefer: -kactivities-stats-devel-32bit
+Prefer: -kactivities5-devel-32bit
+Prefer: -karchive-devel-32bit
+Prefer: -kauth-devel-32bit
+Prefer: -kbookmarks-devel-32bit
+Prefer: -kcmutils-devel-32bit
+Prefer: -kcodecs-devel-32bit
+Prefer: -kcompletion-devel-32bit
+Prefer: -kconfig-devel-32bit
+Prefer: -kconfigwidgets-devel-32bit
+Prefer: -kcontacts-devel-32bit
+Prefer: -kcoreaddons-devel-32bit
+Prefer: -kcrash-devel-32bit
+Prefer: -kdbusaddons-devel-32bit
+Prefer: -kdeclarative-devel-32bit
+Prefer: -kdelibs4support-devel-32bit
+Prefer: -kdesu-devel-32bit
+Prefer: -kdewebkit-devel-32bit
+Prefer: -kdnssd-framework-devel-32bit
+Prefer: -kdoctools-devel-32bit
+Prefer: -kemoticons-devel-32bit
+Prefer: -keyutils-devel-32bit
+Prefer: -kglobalaccel-devel-32bit
+Prefer: -kguiaddons-devel-32bit
+Prefer: -khtml-devel-32bit
+Prefer: -ki18n-devel-32bit
+Prefer: -kiconthemes-devel-32bit
+Prefer: -kidletime-devel-32bit
+Prefer: -kio-devel-32bit
+Prefer: -kitemmodels-devel-32bit
+Prefer: -kitemviews-devel-32bit
+Prefer: -kjobwidgets-devel-32bit
+Prefer: -kjs-devel-32bit
+Prefer: -kjsembed-devel-32bit
+Prefer: -kmediaplayer-devel-32bit
+Prefer: -knewstuff-devel-32bit
+Prefer: -knotifications-devel-32bit
+Prefer: -knotifyconfig-devel-32bit
+Prefer: -kpackage-devel-32bit
+Prefer: -kparts-devel-32bit
+Prefer: -kpeople5-devel-32bit
+Prefer: -kplotting-devel-32bit
+Prefer: -kpty-devel-32bit
+Prefer: -krb5-devel-32bit
+Prefer: -kross-devel-32bit
+Prefer: -krunner-devel-32bit
+Prefer: -kservice-devel-32bit
+Prefer: -ktexteditor-devel-32bit
+Prefer: -ktextwidgets-devel-32bit
+Prefer: -kunitconversion-devel-32bit
+Prefer: -kwallet-devel-32bit
+Prefer: -kwayland-devel-32bit
+Prefer: -kwidgetsaddons-devel-32bit
+Prefer: -kwindowsystem-devel-32bit
+Prefer: -kxmlgui-devel-32bit
+Prefer: -kxmlrpcclient5-devel-32bit
+Prefer: -lapack-devel-32bit
+Prefer: -lapacke-devel-32bit
+Prefer: -libBox2D-devel-32bit
+Prefer: -libFS-devel-32bit
+Prefer: -libHX-devel-32bit
+Prefer: -libICE-devel-32bit
+Prefer: -libKF5NetworkManagerQt-devel-32bit
+Prefer: -libMagick++-devel-32bit
+Prefer: -libOSMesa-devel-32bit
+Prefer: -libQt5Concurrent-devel-32bit
+Prefer: -libQt5Core-devel-32bit
+Prefer: -libQt5DBus-devel-32bit
+Prefer: -libQt5Gui-devel-32bit
+Prefer: -libQt5Network-devel-32bit
+Prefer: -libQt5OpenGL-devel-32bit
+Prefer: -libQt5PrintSupport-devel-32bit
+Prefer: -libQt5Sql-devel-32bit
+Prefer: -libQt5Test-devel-32bit
+Prefer: -libQt5WebKit5-devel-32bit
+Prefer: -libQt5WebKitWidgets-devel-32bit
+Prefer: -libQt5Widgets-devel-32bit
+Prefer: -libQt5Xml-devel-32bit
+Prefer: -libSDL-devel-32bit
+Prefer: -libSDL2-devel-32bit
+Prefer: -libSDL2_gfx-devel-32bit
+Prefer: -libSDL2_image-devel-32bit
+Prefer: -libSDL2_mixer-devel-32bit
+Prefer: -libSDL2_net-devel-32bit
+Prefer: -libSDL2_ttf-devel-32bit
+Prefer: -libSDL_Pango-devel-32bit
+Prefer: -libSDL_gfx-devel-32bit
+Prefer: -libSDL_image-devel-32bit
+Prefer: -libSDL_mixer-devel-32bit
+Prefer: -libSDL_net-devel-32bit
+Prefer: -libSDL_sound-devel-32bit
+Prefer: -libSDL_ttf-devel-32bit
+Prefer: -libSDLmm-devel-32bit
+Prefer: -libSM-devel-32bit
+Prefer: -libX11-devel-32bit
+Prefer: -libXau-devel-32bit
+Prefer: -libXaw-devel-32bit
+Prefer: -libXaw3d-devel-32bit
+Prefer: -libXcomposite-devel-32bit
+Prefer: -libXcursor-devel-32bit
+Prefer: -libXdamage-devel-32bit
+Prefer: -libXdmcp-devel-32bit
+Prefer: -libXevie-devel-32bit
+Prefer: -libXext-devel-32bit
+Prefer: -libXfixes-devel-32bit
+Prefer: -libXfont-devel-32bit
+Prefer: -libXfont2-devel-32bit
+Prefer: -libXfontcache-devel-32bit
+Prefer: -libXft-devel-32bit
+Prefer: -libXi-devel-32bit
+Prefer: -libXinerama-devel-32bit
+Prefer: -libXmu-devel-32bit
+Prefer: -libXp-devel-32bit
+Prefer: -libXpm-devel-32bit
+Prefer: -libXprintAppUtil-devel-32bit
+Prefer: -libXprintUtil-devel-32bit
+Prefer: -libXrandr-devel-32bit
+Prefer: -libXrender-devel-32bit
+Prefer: -libXres-devel-32bit
+Prefer: -libXss-devel-32bit
+Prefer: -libXt-devel-32bit
+Prefer: -libXtst-devel-32bit
+Prefer: -libXv-devel-32bit
+Prefer: -libXvMC-devel-32bit
+Prefer: -libXxf86dga-devel-32bit
+Prefer: -libXxf86vm-devel-32bit
+Prefer: -libacl-devel-32bit
+Prefer: -libadns-devel-32bit
+Prefer: -libaio-devel-32bit
+Prefer: -libart_lgpl-devel-32bit
+Prefer: -libattr-devel-32bit
+Prefer: -libavc1394-devel-32bit
+Prefer: -libbasicobjects-devel-32bit
+Prefer: -libblkid-devel-32bit
+Prefer: -libbotan-devel-32bit
+Prefer: -libbz2-devel-32bit
+Prefer: -libcelt-devel-32bit
+Prefer: -libcmocka-devel-32bit
+Prefer: -libcollection-devel-32bit
+Prefer: -libcom_err-devel-32bit
+Prefer: -libcrystalhd-devel-32bit
+Prefer: -libcurl-devel-32bit
+Prefer: -libdb-4_8-devel-32bit
+Prefer: -libdbi-devel-32bit
+Prefer: -libdbusmenu-qt5-devel-32bit
+Prefer: -libdhash-devel-32bit
+Prefer: -libdmx-devel-32bit
+Prefer: -libdrm-devel-32bit
+Prefer: -libdwarves-devel-32bit
+Prefer: -libeditorconfig-devel-32bit
+Prefer: -libelf-devel-32bit
+Prefer: -libexif-devel-32bit
+Prefer: -libexpat-devel-32bit
+Prefer: -libext2fs-devel-32bit
+Prefer: -libfabric-devel-32bit
+Prefer: -libfdt-devel-32bit
+Prefer: -libffi-devel-32bit
+Prefer: -libfl-devel-32bit
+Prefer: -libfontenc-devel-32bit
+Prefer: -libgbm-devel-32bit
+Prefer: -libgck-devel-32bit
+Prefer: -libgcr-devel-32bit
+Prefer: -libgcrypt-devel-32bit
+Prefer: -libglue-devel-32bit
+Prefer: -libglvnd-devel-32bit
+Prefer: -libgnutls-devel-32bit
+Prefer: -libgpg-error-devel-32bit
+Prefer: -libgphoto2-devel-32bit
+Prefer: -libgsm-devel-32bit
+Prefer: -libhts-devel-32bit
+Prefer: -libicu-devel-32bit
+Prefer: -libini_config-devel-32bit
+Prefer: -libjack-devel-32bit
+Prefer: -libjbig-devel-32bit
+Prefer: -libjpeg62-devel-32bit
+Prefer: -libjpeg8-devel-32bit
+Prefer: -libkdecoration2-devel-32bit
+Prefer: -libkms-devel-32bit
+Prefer: -libkscreen2-devel-32bit
+Prefer: -libksysguard5-devel-32bit
+Prefer: -liblbxutil-devel-32bit
+Prefer: -liblcms2-devel-32bit
+Prefer: -libmount-devel-32bit
+Prefer: -libnetapi-devel-32bit
+Prefer: -libnettle-devel-32bit
+Prefer: -libnl3-devel-32bit
+Prefer: -libnotify-devel-32bit
+Prefer: -liboldX-devel-32bit
+Prefer: -libopenssl-1_0_0-devel-32bit
+Prefer: -libopenssl-1_1-devel-32bit
+Prefer: -liboping-devel-32bit
+Prefer: -libotf-devel-32bit
+Prefer: -libpackagekit-glib2-devel-32bit
+Prefer: -libpath_utils-devel-32bit
+Prefer: -libpcap-devel-32bit
+Prefer: -libpng12-compat-devel-32bit
+Prefer: -libpng12-devel-32bit
+Prefer: -libpng16-compat-devel-32bit
+Prefer: -libpng16-devel-32bit
+Prefer: -libpolkit-qt5-1-devel-32bit
+Prefer: -libpulse-devel-32bit
+Prefer: -libqb-devel-32bit
+Prefer: -libqt5-qtconnectivity-devel-32bit
+Prefer: -libqt5-qtdeclarative-devel-32bit
+Prefer: -libqt5-qtgamepad-devel-32bit
+Prefer: -libqt5-qtlocation-devel-32bit
+Prefer: -libqt5-qtmultimedia-devel-32bit
+Prefer: -libqt5-qtnetworkauth-devel-32bit
+Prefer: -libqt5-qtremoteobjects-devel-32bit
+Prefer: -libqt5-qtscript-devel-32bit
+Prefer: -libqt5-qtscxml-devel-32bit
+Prefer: -libqt5-qtsensors-devel-32bit
+Prefer: -libqt5-qtserialbus-devel-32bit
+Prefer: -libqt5-qtserialport-devel-32bit
+Prefer: -libqt5-qtspeech-devel-32bit
+Prefer: -libqt5-qtsvg-devel-32bit
+Prefer: -libqt5-qttools-devel-32bit
+Prefer: -libqt5-qtwayland-devel-32bit
+Prefer: -libqt5-qtwebchannel-devel-32bit
+Prefer: -libqt5-qtwebengine-devel-32bit
+Prefer: -libqt5-qtwebsockets-devel-32bit
+Prefer: -libqt5-qtx11extras-devel-32bit
+Prefer: -libqt5-qtxmlpatterns-devel-32bit
+Prefer: -libraw1394-devel-32bit
+Prefer: -libref_array-devel-32bit
+Prefer: -libreiserfs-devel-32bit
+Prefer: -libressl-devel-32bit
+Prefer: -libscalapack2-mvapich2-devel-32bit
+Prefer: -libscalapack2-openmpi1-devel-32bit
+Prefer: -libscalapack2-openmpi2-devel-32bit
+Prefer: -libscalapack2-openmpi3-devel-32bit
+Prefer: -libscalapack2-openmpi4-devel-32bit
+Prefer: -libsoup-devel-32bit
+Prefer: -libstatgrab-devel-32bit
+Prefer: -libstdc++-devel-32bit
+Prefer: -libtasn1-devel-32bit
+Prefer: -libtiff-devel-32bit
+Prefer: -libudev-devel-32bit
+Prefer: -libunistring-devel-32bit
+Prefer: -libusb-1_0-devel-32bit
+Prefer: -libuuid-devel-32bit
+Prefer: -libv4l-devel-32bit
+Prefer: -libva-devel-32bit
+Prefer: -libva-gl-devel-32bit
+Prefer: -libvdpau-devel-32bit
+Prefer: -libverto-devel-32bit
+Prefer: -libvirt-devel-32bit
+Prefer: -libvorbis-devel-32bit
+Prefer: -libvpd2-devel-32bit
+Prefer: -libwebp-devel-32bit
+Prefer: -libxcb-devel-32bit
+Prefer: -libxcrypt-devel-32bit
+Prefer: -libxkbcommon-devel-32bit
+Prefer: -libxkbcommon-x11-devel-32bit
+Prefer: -libxkbfile-devel-32bit
+Prefer: -libxkbui-devel-32bit
+Prefer: -libxml2-devel-32bit
+Prefer: -libxslt-devel-32bit
+Prefer: -libyajl-devel-32bit
+Prefer: -libyaz-devel-32bit
+Prefer: -llvm10-LTO-devel-32bit
+Prefer: -llvm10-devel-32bit
+Prefer: -llvm7-LTO-devel-32bit
+Prefer: -llvm7-devel-32bit
+Prefer: -llvm8-LTO-devel-32bit
+Prefer: -llvm8-devel-32bit
+Prefer: -llvm9-LTO-devel-32bit
+Prefer: -llvm9-devel-32bit
+Prefer: -lzo-devel-32bit
+Prefer: -motif-devel-32bit
+Prefer: -mpc-devel-32bit
+Prefer: -mpfr-devel-32bit
+Prefer: -mpg123-devel-32bit
+Prefer: -munge-devel-32bit
+Prefer: -muparser-devel-32bit
+Prefer: -ncurses-devel-32bit
+Prefer: -ncurses5-devel-32bit
+Prefer: -net-snmp-devel-32bit
+Prefer: -ocl-icd-devel-32bit
+Prefer: -openal-soft-devel-32bit
+Prefer: -openjpeg-devel-32bit
+Prefer: -openldap2-devel-32bit
+Prefer: -opensm-devel-32bit
+Prefer: -pam-devel-32bit
+Prefer: -pango-devel-32bit
+Prefer: -papi-devel-32bit
+Prefer: -parpack-openmpi1-devel-32bit
+Prefer: -parpack-openmpi2-devel-32bit
+Prefer: -parpack-openmpi3-devel-32bit
+Prefer: -pciutils-devel-32bit
+Prefer: -phonon4qt5-devel-32bit
+Prefer: -plasma-framework-devel-32bit
+Prefer: -popt-devel-32bit
+Prefer: -prison-qt5-devel-32bit
+Prefer: -purpose-devel-32bit
+Prefer: -rdma-core-devel-32bit
+Prefer: -readline-devel-32bit
+Prefer: -readline5-devel-32bit
+Prefer: -readline6-devel-32bit
+Prefer: -sane-backends-devel-32bit
+Prefer: -solid-devel-32bit
+Prefer: -sonnet-devel-32bit
+Prefer: -spirv-tools-devel-32bit
+Prefer: -syntax-highlighting-devel-32bit
+Prefer: -telepathy-qt5-devel-32bit
+Prefer: -threadweaver-devel-32bit
+Prefer: -tslib-devel-32bit
+Prefer: -utempter-devel-32bit
+Prefer: -vkd3d-devel-32bit
+Prefer: -vulkan-devel-32bit
+Prefer: -wayland-devel-32bit
+Prefer: -wine-devel-32bit
+Prefer: -wine-staging-devel-32bit
+Prefer: -wxWidgets-3_0-devel-32bit
+Prefer: -xcb-util-cursor-devel-32bit
+Prefer: -xcb-util-devel-32bit
+Prefer: -xcb-util-image-devel-32bit
+Prefer: -xcb-util-keysyms-devel-32bit
+Prefer: -xcb-util-renderutil-devel-32bit
+Prefer: -xcb-util-wm-devel-32bit
+Prefer: -xz-devel-32bit
+Prefer: -zlib-devel-32bit
+Prefer: -zvbi-devel-32bit
+Prefer: -zziplib-devel-32bit
# have choice for python3-Sphinx needed by trytond: python3-Sphinx python3-Sphinx2
Prefer: python3-Sphinx
diff --git a/_staging_workflow b/_staging_workflow
index 2370b3c..4dc35c6 100644
--- a/_staging_workflow
+++ b/_staging_workflow
@@ -16,18 +16,14 @@
-
-
-
-
@@ -40,60 +36,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+