From e2f6d807524cedf5399d0a0579daa6052914f532 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Nov 20 2021 07:28:21 +0000
Subject: Fix up debug dirs ownership


---

diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index e2545d1..e6d83c4 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -6,7 +6,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           mingw-filesystem
-Version:        124
+Version:        125
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -235,6 +235,9 @@ mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/locale
 mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/pkgconfig
 mkdir -p %{buildroot}%{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/xml
 
+mkdir -p %{buildroot}%{_prefix}/lib/debug/%{_prefix}/i686-w64-mingw32
+mkdir -p %{buildroot}%{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32
+
 # Own folders for all locales
 # Snippet taken from the Fedora filesystem package
 sed -n -f %{SOURCE102} /usr/share/xml/iso-codes/iso_639.xml > %{buildroot}/iso_639.tab
@@ -331,6 +334,8 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 %{_datadir}/mingw/toolchain-mingw32.meson
 %{pkgconfig_personalitydir}/i686-w64-mingw32.personality
 %{_mandir}/man1/i686-w64-mingw32-pkg-config.1*
+%dir %{_prefix}/lib/debug/%{_prefix}
+%dir %{_prefix}/lib/debug/%{_prefix}/i686-w64-mingw32
 
 
 %files -n mingw64-filesystem
@@ -348,9 +353,14 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 %{_datadir}/mingw/toolchain-mingw64.meson
 %{pkgconfig_personalitydir}/x86_64-w64-mingw32.personality
 %{_mandir}/man1/x86_64-w64-mingw32-pkg-config.1*
+%dir %{_prefix}/lib/debug/%{_prefix}
+%dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32
 
 
 %changelog
+* Sat Nov 20 2021 Sandro Mani <manisandro@gmail.com> - 125-1
+- Fix up debug dirs ownership
+
 * Wed Nov 17 2021 Sandro Mani <manisandro@gmail.com> - 124-1
 - Use relative paths in cmake/meson toolchain files to make ccache work if
   available
diff --git a/mingw-find-debuginfo.sh b/mingw-find-debuginfo.sh
index 41cfa82..0dd2045 100755
--- a/mingw-find-debuginfo.sh
+++ b/mingw-find-debuginfo.sh
@@ -41,4 +41,6 @@ for target in $@; do
 	fi
 	find ${RPM_BUILD_ROOT}/usr/lib/debug/$prefix -type f -name "*.exe.debug" -or -name "*.dll.debug" -or -name "*.pyd.debug" |
 		sed -n -e "s#^$RPM_BUILD_ROOT##p" > $BUILDDIR/${target}-debugfiles.list
+        find ${RPM_BUILD_ROOT}/usr/lib/debug/$prefix/* -type d |
+		sed -n -e "s#^$RPM_BUILD_ROOT#%dir #p" >> $BUILDDIR/${target}-debugfiles.list
 done