openmamba-dist-upgrade: fixes to make it work with current repository

openmamba-update/openmamba-dist-upgrade

@@ -57,7 +57,7 @@ HINTS:
 - this operation can't be reversed
 - it is always a good practice to have a backup of, at least, personal important data
 - broadband connection needed, possibly connect your computer to cable network
-- prepare to wait, upgrade may take up to some hours depending on networks and your computer speed
+- prepare to wait, upgrade may take up to some hours depending on the speed of your computer and network
 - if this is a laptop plug it to AC power
 - in case of problems you may find help on the forums at openmamba.org web site
 
@@ -435,18 +435,25 @@ smart install smart || exit 1
 #smart install -y smart || exit 1
 
 echo "First upgrade stage..."
-smart install -y libreadline libreadline6
-smart install -y libncurses libncurses5
+if [ "$RPMARCH" == "x86_64" ]; then
+    smart install -y libreadline libreadline@i586 libreadline6 libreadline6@i586
+    smart install -y libncurses libncurses@i586 libncurses5 libncurses5@i586
+    smart install -y libnettle libnettle@i586 libnettle4 libnettle4@i586
+    smart install -y libgnutls libgnutls@i586 libgnutls28 libgnutls28@i586
+else
+    smart install -y libreadline libreadline6
+    smart install -y libncurses libncurses5
+    smart install -y libnettle libnettle4
+    smart install -y libgnutls libgnutls28
+fi
 smart install -y libtirpc libtirpc1
-smart install -y libnettle libnettle4
-smart install -y libgnutls libgnutls28
 if [ "$RPMARCH" == "x86_64" ]; then
     smart install -y glibc glibc-multilib
 else
     smart install -y glibc
 fi
 smart install -y openmamba-install-scripts
-smart install -y wxWidgets-i18n
+#smart install -y wxWidgets-i18n
 
 QTVER=`curl -s http://cdn.openmamba.org/pub/openmamba/${REPOSITORY}/SRPMS.base/|grep libqt5|sed "s|.*libqt5-\(.*\)\.src.rpm.*|\1|"`