From 846156c1bda9bcff98c850714fa5da688a55e66a Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Dec 09 2022 11:28:47 +0000
Subject: Prevent mingw-find-lang.sh from clobbering previous find-lang results


---

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 3b7986d..5768418 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -9,7 +9,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        142
+Version:        143
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -376,6 +376,9 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 
 %changelog
+* Fri Dec 09 2022 Sandro Mani <manisandro@gmail.com> - 143-1
+- Prevent mingw-find-lang.sh from clobbering previous find-lang results
+
 * Tue Oct 18 2022 Sandro Mani <manisandro@gmail.com> - 142-1
 - Require mingw-binutils-generic
 
diff --git a/mingw-find-lang.sh b/mingw-find-lang.sh
index 097fc21..55b9adb 100755
--- a/mingw-find-lang.sh
+++ b/mingw-find-lang.sh
@@ -2,16 +2,22 @@
 
 # Wrapper for the %find_lang macro which splits out the various translations in per-target lists
 
+PACKAGE_NAME=$2
+
+# If previous result from native find-lang exists, filter mingw entries and move it out of the way
+test -f ${PACKAGE_NAME}.lang && grep -v mingw32 ${PACKAGE_NAME}.lang > ${PACKAGE_NAME}-native.lang
+
 /usr/lib/rpm/find-lang.sh $*
+
 if test $? != 0 ; then
+    test -f ${PACKAGE_NAME}-native.lang && mv ${PACKAGE_NAME}-native.lang ${PACKAGE_NAME}.lang
     exit 1
 fi
 
-PACKAGE_NAME=$2
 targets=`rpm --eval '%{mingw_build_targets}'`
 for target in $targets; do
 	prefix=`rpm --eval "%{${target}_prefix}"`
-	cat $2.lang | grep "$prefix" > ${target}-$PACKAGE_NAME.lang
+	cat ${PACKAGE_NAME}.lang | grep "$prefix" > ${target}-$PACKAGE_NAME.lang
 done
 
-exit 0
+test -f ${PACKAGE_NAME}-native.lang && mv ${PACKAGE_NAME}-native.lang ${PACKAGE_NAME}.lang