From f6cc2b6d756f8201c3119b34046a4da5bf85456a Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Sun, 29 Aug 2021 23:04:14 +0200
Subject: [PATCH] Don't use deprecated external dependency generator

---
 macros.mingw                         |  7 -------
 mingw-filesystem.spec                | 11 ++++++++---
 mingw-find-provides.sh => mingw.prov |  0
 mingw-find-requires.sh => mingw.req  |  0
 mingw32.attr                         |  4 ++--
 mingw64.attr                         |  4 ++--
 6 files changed, 12 insertions(+), 14 deletions(-)
 rename mingw-find-provides.sh => mingw.prov (100%)
 rename mingw-find-requires.sh => mingw.req (100%)

diff --git a/macros.mingw b/macros.mingw
index 78417ef..5e5b5f0 100644
--- a/macros.mingw
+++ b/macros.mingw
@@ -9,8 +9,6 @@
 %mingw_objcopy              mingw-objcopy
 %mingw_nm                   mingw-nm
 
-%mingw_findprovides         %{_rpmconfigdir}/mingw-find-provides.sh %{mingw_build_targets}
-%mingw_findrequires         %{_rpmconfigdir}/mingw-find-requires.sh %{mingw_build_targets}
 %mingw_finddebuginfo        %{_rpmconfigdir}/mingw-find-debuginfo.sh
 
 %mingw_find_lang            %{_rpmconfigdir}/mingw-find-lang.sh %{buildroot}
@@ -29,11 +27,6 @@
 %mingw_package_header                                         \
 %global __strip %{mingw_strip}                                \
 %global __objdump %{mingw_objdump}                            \
-%if 0%{?rhel} == 6                                            \
-%global _use_internal_dependency_generator 0                  \
-%global __find_requires %{mingw_findrequires}                 \
-%global __find_provides %{mingw_findprovides}                 \
-%endif                                                        \
 %global __debug_install_post %%{mingw_debug_install_post}     \
 %{nil}
 
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index b043420..8d3ee47 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:        120
+Version:        121
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
@@ -21,8 +21,8 @@ Source3:        macros.mingw64
 Source4:        mingw32.sh
 Source5:        mingw64.sh
 Source6:        mingw-find-debuginfo.sh
-Source7:        mingw-find-requires.sh
-Source8:        mingw-find-provides.sh
+Source7:        mingw.req
+Source8:        mingw.prov
 Source9:        mingw-scripts.sh
 Source10:       mingw-rpmlint.config
 Source11:       toolchain-mingw32.cmake
@@ -351,6 +351,11 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
 
 
 %changelog
+* Sun Aug 29 2021 Sandro Mani <manisandro@gmail.com> - 121-1
+- Drop use of deprecated external dependency generator
+- Fix file listed twice
+- Fix copying minidebug symbols to binary in mingw-find-debuginfo.sh
+
 * Fri Aug 27 2021 Sandro Mani <manisandro@gmail.com> - 120-1
 - Adapt mingw-find-debuginfo.sh to store debug files below /usr/lib/debug
 - See https://fedoraproject.org/wiki/Changes/F36MingwDebugLocation
diff --git a/mingw-find-provides.sh b/mingw.prov
similarity index 100%
rename from mingw-find-provides.sh
rename to mingw.prov
diff --git a/mingw-find-requires.sh b/mingw.req
similarity index 100%
rename from mingw-find-requires.sh
rename to mingw.req
diff --git a/mingw32.attr b/mingw32.attr
index 498385b..3baed2e 100644
--- a/mingw32.attr
+++ b/mingw32.attr
@@ -1,3 +1,3 @@
-%__mingw32_provides	%{_rpmconfigdir}/mingw-find-provides.sh mingw32
-%__mingw32_requires	%{_rpmconfigdir}/mingw-find-requires.sh mingw32
+%__mingw32_provides     %{_rpmconfigdir}/mingw.prov mingw32
+%__mingw32_requires     %{_rpmconfigdir}/mingw.req mingw32
 %__mingw32_path		^%{mingw32_prefix}/.*\.([Dd][Ll][Ll]|[Ee][Xx][Ee])$
diff --git a/mingw64.attr b/mingw64.attr
index 9e7ab01..26b69cd 100644
--- a/mingw64.attr
+++ b/mingw64.attr
@@ -1,3 +1,3 @@
-%__mingw64_provides	%{_rpmconfigdir}/mingw-find-provides.sh mingw64
-%__mingw64_requires	%{_rpmconfigdir}/mingw-find-requires.sh mingw64
+%__mingw64_provides     %{_rpmconfigdir}/mingw.prov mingw64
+%__mingw64_requires     %{_rpmconfigdir}/mingw.req mingw64
 %__mingw64_path		^%{mingw64_prefix}/.*\.([Dd][Ll][Ll]|[Ee][Xx][Ee])$