msys2-runtime-3.3: on i686 setups, replace msys2-runtime

With this change, i686 variants of the Git for Windows SDK will
automatically be moved to the v3.3.* train, allowing msys2-runtime to
upgrade to v3.4.* (which does not build on i686 anymore).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Author: dscho

msys2-runtime-3.3/PKGBUILD

@@ -298,6 +298,8 @@ package_msys2-runtime-3.3() {
   replaces=('catgets' 'libcatgets')
   #install=msys2-runtime.install
 
+  test i686-pc-msys != "$CHOST" || replaces+=('msys2-runtime')
+
   mkdir -p "${pkgdir}"/usr
   cp -rf "${srcdir}"/dest/usr/bin "${pkgdir}"/usr/
   rm -f "${pkgdir}"/usr/bin/msys-2.0.dbg
@@ -318,6 +320,8 @@ package_msys2-runtime-3.3-devel() {
   conflicts=('libcatgets-devel' 'msys2-runtime-devel')
   replaces=('libcatgets-devel')
 
+  test i686-pc-msys != "$CHOST" || replaces+=('msys2-runtime-devel')
+
   mkdir -p "${pkgdir}"/usr/bin
   cp -f "${srcdir}"/dest/usr/bin/msys-2.0.dbg "${pkgdir}"/usr/bin/
   cp -rLf "${srcdir}"/dest/usr/${CHOST}/include "${pkgdir}"/usr/