Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/mailx.git#fed01e1b43a9a8240fa55c76a970de8bf6151d4b

mailx.spec

@@ -4,7 +4,7 @@
 Summary: Enhanced implementation of the mailx command
 Name: mailx
 Version: 12.5
-Release: 36%{?dist}
+Release: 37%{?dist}
 # MPLv1.1 .. nss.c, nsserr.c
 License: BSD with advertising and MPLv1.1
 URL: http://heirloom.sourceforge.net/mailx.html
@@ -149,9 +149,9 @@ fi
 %post
 # set up the alternatives files
 %{_sbindir}/update-alternatives --install %{_bindir}/mailx mailx %{_bindir}/mailx.%{name} 200 \
-    --slave %{_bindir}/Mail Mail %{_bindir}/%{name} \
-    --slave %{_bindir}/mail mail %{_bindir}/%{name} \
-    --slave %{_bindir}/nail nail %{_bindir}/%{name} \
+    --slave %{_bindir}/Mail Mail %{_bindir}/mailx.%{name} \
+    --slave %{_bindir}/mail mail %{_bindir}/mailx.%{name} \
+    --slave %{_bindir}/nail nail %{_bindir}/mailx.%{name} \
     --slave %{_mandir}/man1/mailx.1.gz mailx.1.gz %{_mandir}/man1/mailx.%{name}.1.gz \
     --slave %{_mandir}/man1/Mail.1.gz Mail.1.gz %{_mandir}/man1/mailx.%{name}.1.gz \
     --slave %{_mandir}/man1/mail.1.gz mail.1.gz %{_mandir}/man1/mailx.%{name}.1.gz \
@@ -198,6 +198,10 @@ fi
 
 
 %changelog
+* Tue Mar 16 2021 Nikola Forró <nforro@redhat.com> - 12.5-37
+- Fix alternatives
+  resolves: #1897928
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 12.5-36
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild