import mingw-filesystem-147-1.el9

fd311a69 · Rocky Automation · 6a768fbf · fd311a69 · fd311a69 · fd311a69
Commit fd311a69 authored 1 year ago by Rocky Automation
--- a/.mingw-filesystem.checksum
+++ b/.mingw-filesystem.checksum
+9bf67ce682fd7a58c5fca07eb3b21ed83838262608578f8b6500e56756c40783
--- a/SOURCES/macros.mingw
+++ b/SOURCES/macros.mingw
@@ -65,12 +65,15 @@ run_mingw_configure
 run_mingw_make()                                                    \
 {                                                                   \
 %if 0%{?mingw_build_win32} == 1                                     \
+%{mingw32_env}                                                      \
 %{__make} -C build_win32$MINGW_BUILDDIR_SUFFIX "$@" $MINGW32_MAKE_ARGS   \
 %endif                                                              \
 %if 0%{?mingw_build_win64} == 1                                     \
+%{mingw64_env}                                                      \
 %{__make} -C build_win64$MINGW_BUILDDIR_SUFFIX "$@" $MINGW64_MAKE_ARGS   \
 %endif                                                              \
 %if 0%{?mingw_build_ucrt64} == 1                                    \
+%{ucrt64_env}                                                       \
 %{__make} -C build_ucrt64$MINGW_BUILDDIR_SUFFIX "$@" $UCRT64_MAKE_ARGS   \
 %endif                                                              \
 }                                                                   \
@@ -100,53 +103,56 @@ popd                                                   \
 }                                                      \
 run_mingw_cmake
-%mingw_cmake_kde4                                      \
-run_mingw_cmake_kde4()                                 \
+%mingw_qmake_qt5                                       \
+run_mingw_qmake_qt5()                                  \
 {                                                      \
 %if 0%{?mingw_build_win32} == 1                        \
 mkdir -p build_win32$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw32_cmake_kde4 "$@"}                        \
+    %{?mingw32_qmake_qt5} "$@"                         \
 popd                                                   \
 %endif                                                 \
 %if 0%{?mingw_build_win64} == 1                        \
 mkdir -p build_win64$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw64_cmake_kde4 "$@"}                        \
+    %{?mingw64_qmake_qt5} "$@"                         \
 popd                                                   \
 %endif                                                 \
 %if 0%{?mingw_build_ucrt64} == 1                       \
 mkdir -p build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
 pushd build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
-    %{?ucrt64_cmake_kde4 "$@"}                         \
+    %{?ucrt64_qmake_qt5} "$@"                          \
 popd                                                   \
 %endif                                                 \
 }                                                      \
-run_mingw_cmake_kde4
+run_mingw_qmake_qt5
-%mingw_qmake_qt5                                       \
-run_mingw_qmake_qt5()                                  \
+%mingw_qmake_qt6                                       \
+run_mingw_qmake_qt6()                                  \
 {                                                      \
 %if 0%{?mingw_build_win32} == 1                        \
 mkdir -p build_win32$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw32_qmake_qt5} "$@"                         \
+    %{?mingw32_qmake_qt6} "$@"                         \
 popd                                                   \
 %endif                                                 \
 %if 0%{?mingw_build_win64} == 1                        \
 mkdir -p build_win64$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw64_qmake_qt5} "$@"                         \
+    %{?mingw64_qmake_qt6} "$@"                         \
 popd                                                   \
 %endif                                                 \
 %if 0%{?mingw_build_ucrt64} == 1                       \
 mkdir -p build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
 pushd build_ucrt64$MINGW_BUILDDIR_SUFFIX               \
-    %{?ucrt64_qmake_qt5} "$@"                          \
+    %{?ucrt64_qmake_qt6} "$@"                          \
 popd                                                   \
 %endif                                                 \
 }                                                      \
-run_mingw_qmake_qt5
+run_mingw_qmake_qt6
 %mingw_meson                                           \
 run_mingw_meson()                                      \

--- a/SOURCES/macros.mingw32
+++ b/SOURCES/macros.mingw32
@@ -27,6 +27,7 @@
 %mingw32_cppflags        %{nil}
 %mingw32_fflags          -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
 %mingw32_ldflags         -fstack-protector -lssp
+%mingw32_rustflags       -Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cforce-frame-pointers=yes --cap-lints=warn
 %mingw32_cc              %{mingw32_target}-gcc
 %mingw32_cxx             %{mingw32_target}-g++
@@ -50,7 +51,7 @@
 %mingw32_windmc          %{mingw32_target}-windmc
 %mingw32_windres         %{mingw32_target}-windres
-%mingw32_env unset $(/usr/bin/env | egrep '^(\w+)=(.*)$' | egrep -vw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
+%mingw32_env unset $(/usr/bin/env | grep -E '^(\w+)=(.*)$' | grep -Evw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
  if test -z "$PATH_ORIG" ; then \
    PATH_ORIG="$PATH"; export PATH_ORIG; \
  fi; \
@@ -77,6 +78,7 @@
  FFLAGS="${MINGW32_FFLAGS-%mingw32_fflags}"; export FFLAGS; \
  FCFLAGS="${MINGW32_FCFLAGS-%mingw32_fflags}"; export FCFLAGS; \
  LDFLAGS="${MINGW32_LDFLAGS:-%mingw32_ldflags}"; export LDFLAGS; \
+  RUSTFLAGS="${MINGW32_RUSTFLAGS:-%mingw32_rustflags}"; export RUSTFLAGS; \
  for i in `ls %{mingw32_bindir}/*|grep -- "-config\$"` ; do \
    x=`basename $i|tr "a-z+-." "A-ZX_"`; \
    declare -x $x="$i" ; export $x; \
@@ -146,12 +148,10 @@
  MINGW32_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir} ${MINGW32_CMAKE_ARGS}" \
  %mingw32_cmake_generic
-%mingw32_cmake_kde4 \
-  MINGW32_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw32_includedir}/kde4 ${MINGW32_CMAKE_ARGS}" \
-  %mingw32_cmake_generic
 %mingw32_qmake_qt5 /usr/bin/mingw32-qmake-qt5
+%mingw32_qmake_qt6 /usr/bin/%{mingw32_target}-qmake-qt6
 %mingw32_meson %{mingw32_env} ; \
  unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
  CFLAGS="${MINGW32_CFLAGS-%mingw32_cflags}"; export CFLAGS; \\\

--- a/SOURCES/macros.mingw64
+++ b/SOURCES/macros.mingw64
@@ -27,6 +27,7 @@
 %mingw64_cppflags        %{nil}
 %mingw64_fflags          -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4
 %mingw64_ldflags         -fstack-protector -lssp
+%mingw64_rustflags       -Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1 -Cforce-frame-pointers=yes --cap-lints=warn
 %mingw64_cc              %{mingw64_target}-gcc
 %mingw64_cxx             %{mingw64_target}-g++
@@ -50,7 +51,7 @@
 %mingw64_windmc          %{mingw64_target}-windmc
 %mingw64_windres         %{mingw64_target}-windres
-%mingw64_env unset $(/usr/bin/env | egrep '^(\w+)=(.*)$' | egrep -vw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
+%mingw64_env unset $(/usr/bin/env | grep -E '^(\w+)=(.*)$' | grep -Evw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
  if test -z "$PATH_ORIG" ; then \
    PATH_ORIG="$PATH"; export PATH_ORIG; \
  fi; \
@@ -77,6 +78,7 @@
  FFLAGS="${MINGW64_FFLAGS-%mingw64_fflags}"; export FFLAGS; \
  FCFLAGS="${MINGW64_FCFLAGS-%mingw64_fflags}"; export FCFLAGS; \
  LDFLAGS="${MINGW64_LDFLAGS:-%mingw64_ldflags}"; export LDFLAGS; \
+  RUSTFLAGS="${MINGW64_RUSTFLAGS:-%mingw64_rustflags}"; export RUSTFLAGS; \
  for i in `ls %{mingw64_bindir}/*|grep -- "-config\$"` ; do \
    x=`basename $i|tr "a-z+-." "A-ZX_"`; \
    declare -x $x="$i" ; export $x; \
@@ -146,12 +148,10 @@
  MINGW64_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir} ${MINGW64_CMAKE_ARGS}" \
  %mingw64_cmake_generic
-%mingw64_cmake_kde4 \
-  MINGW64_CMAKE_ARGS="-DINCLUDE_INSTALL_DIR:PATH=%{mingw64_includedir}/kde4 ${MINGW64_CMAKE_ARGS}" \
-  %mingw64_cmake_generic
 %mingw64_qmake_qt5 /usr/bin/mingw64-qmake-qt5
+%mingw64_qmake_qt6 /usr/bin/%{mingw64_target}-qmake-qt6
 %mingw64_meson %{mingw64_env} ; \
  unset CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS; \\\
  CFLAGS="${MINGW64_CFLAGS-%mingw64_cflags}"; export CFLAGS; \\\

--- a/SOURCES/macros.ucrt64
+++ b/SOURCES/macros.ucrt64
@@ -49,7 +49,7 @@
 %ucrt64_windmc          %{ucrt64_target}-windmc
 %ucrt64_windres         %{ucrt64_target}-windres
-%ucrt64_env unset $(/usr/bin/env | egrep '^(\w+)=(.*)$' | egrep -vw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
+%ucrt64_env unset $(/usr/bin/env | grep -E '^(\w+)=(.*)$' | grep -Evw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1); \
  if test -z "$PATH_ORIG" ; then \
    PATH_ORIG="$PATH"; export PATH_ORIG; \
  fi; \

--- a/SOURCES/mingw-find-debuginfo.sh
+++ b/SOURCES/mingw-find-debuginfo.sh
@@ -12,7 +12,7 @@ shift
 for f in `find $RPM_BUILD_ROOT -type f -name "*.exe" -or -name "*.dll" -or -name "*.pyd"`
 do
-	case $(mingw-objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in
+	case $(mingw-objdump -h $f 2>/dev/null | grep -Eo '(debug[\.a-z_]*|gnu.version)') in
 	    *debuglink*) continue ;;
 	    *debug*) ;;
 	    *gnu.version*)

--- a/SOURCES/mingw-find-lang.sh
+++ b/SOURCES/mingw-find-lang.sh
@@ -2,16 +2,23 @@
 # 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
+test -f ${PACKAGE_NAME}-native.lang && mv ${PACKAGE_NAME}-native.lang ${PACKAGE_NAME}.lang
 exit 0
--- a/SPECS/mingw-filesystem.spec
+++ b/SPECS/mingw-filesystem.spec
+# Define before mingw-binutils is build
+%bcond_with bootstrap
 %global debug_package %{nil}
 # Place RPM macros in %%{_rpmconfigdir}/macros.d if it exists (RPM 4.11+)
@@ -6,11 +9,11 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 Name:           mingw-filesystem
-Version:        139
+Version:        147
 Release:        1%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
-License:        GPLv2+
+License:        GPL-2.0-or-later
 URL:            http://fedoraproject.org/wiki/MinGW
 BuildArch:      noarch
@@ -87,9 +90,12 @@ This environment is maintained by the Fedora MinGW SIG at:
 Summary:        MinGW cross compiler base filesystem and environment for the win32 target
 Requires:       %{name}-base = %{version}-%{release}
 # Replace mingw32-pkg-config
-Conflicts:      mingw32-pkg-config < 0.28-18
+Conflicts:      mingw32-pkg-config < 0.28-17
-Obsoletes:      mingw32-pkg-config < 0.28-18
+Obsoletes:      mingw32-pkg-config < 0.28-17
-Provides:       mingw32-pkg-config = 0.28-18
+Provides:       mingw32-pkg-config = 0.28-17
+%if %{without bootstrap}
+Requires:       mingw-binutils-generic
+%endif
 %description -n mingw32-filesystem
 This package contains the base filesystem layout, RPM macros and
@@ -104,10 +110,12 @@ This environment is maintained by the Fedora MinGW SIG at:
 Summary:        MinGW cross compiler base filesystem and environment for the win64 target
 Requires:       %{name}-base = %{version}-%{release}
 # Replace mingw64-pkg-config
-Conflicts:      mingw64-pkg-config < 0.28-18
+Conflicts:      mingw64-pkg-config < 0.28-17
-Obsoletes:      mingw64-pkg-config < 0.28-18
+Obsoletes:      mingw64-pkg-config < 0.28-17
-Provides:       mingw64-pkg-config = 0.28-18
+Provides:       mingw64-pkg-config = 0.28-17
+%if %{without bootstrap}
+Requires:       mingw-binutils-generic
+%endif
 %description -n mingw64-filesystem
 This package contains the base filesystem layout, RPM macros and
@@ -117,6 +125,7 @@ This environment is maintained by the Fedora MinGW SIG at:
  http://fedoraproject.org/wiki/SIGs/MinGW
 %package -n ucrt64-filesystem
 Summary:        MinGW cross compiler base filesystem and environment for the win64 UCRT target
 Requires:       %{name}-base = %{version}-%{release}
@@ -124,7 +133,9 @@ Requires:       %{name}-base = %{version}-%{release}
 Conflicts:      ucrt64-pkg-config < 0.28-17
 Obsoletes:      ucrt64-pkg-config < 0.28-17
 Provides:       ucrt64-pkg-config = 0.28-17
+%if %{without bootstrap}
+Requires:       mingw-binutils-generic
+%endif
 %description -n ucrt64-filesystem
 This package contains the base filesystem layout, RPM macros and
@@ -208,6 +219,8 @@ for target in i686-w64-mingw32 x86_64-w64-mingw32 x86_64-w64-mingw32ucrt; do
  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/locale
  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/pkgconfig
  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/xml
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/icons
+  mkdir -p %{buildroot}%{_prefix}/$target/sys-root/mingw/share/metainfo
  mkdir -p %{buildroot}%{_prefix}/lib/debug/%{_prefix}/$target
 done
@@ -245,7 +258,7 @@ cat %{SOURCE101} | grep -v "^#" | grep -v "^$" | while read loc ; do
    fi
    # If the locale is not official and not special, skip it
    if [ -z "$special" ]; then
-        egrep -q "[[:space:]]${locale%%_*}[[:space:]]" %{buildroot}/iso_639.tab || continue
+        grep -Eq "[[:space:]]${locale%%_*}[[:space:]]" %{buildroot}/iso_639.tab || continue
    fi
    echo "%lang(${locale}) %{_prefix}/i686-w64-mingw32/sys-root/mingw/share/locale/${loc}" >> filelist_mingw32
    echo "%lang(${locale}) %{_prefix}/x86_64-w64-mingw32/sys-root/mingw/share/locale/${loc}" >> filelist_mingw64
@@ -363,21 +376,118 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 %dir %{_prefix}/lib/debug/%{_prefix}/x86_64-w64-mingw32ucrt
 %changelog
-* Thu Jul 21 2022 Richard W.M. Jones <rjones@redhat.com> - 139-1
+* Fri Apr 07 2023 Sandro Mani <manisandro@gmail.com> - 147-1
- Rebase to Fedora Rawhide
+- Set mingw_env before in run_mingw_make
-  resolves: rhbz#2080168
+* Wed Apr 05 2023 Sandro Mani <manisandro@gmail.com> - 146-1
+- Set RUSTFLAGS in mingw env
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 145-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+* Sat Dec 31 2022 Sandro Mani <manisandro@gmail.com> - 145-1
+- Fix mingw-find-lang.sh exit code
+* Fri Dec 23 2022 Sandro Mani <manisandro@gmail.com> - 144-1
+- Add mingw-qmake-qt6 macros, drop mingw-cmake-kde4 macros
+* 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
+* Tue Sep 27 2022 Sandro Mani <manisandro@gmail.com> - 141-2
+- Replace egrep with grep -E
+* Sat Jul 30 2022 Sandro Mani <manisandro@gmail.com> - 141-1
+- Revert unsetting _PREFIX
+* Fri Jul 29 2022 Sandro Mani <manisandro@gmail.com> - 140-1
+- Don't unset _PREFIX in mingw-env macro, it leads to ${_PREFIX}
+  being empty when evaluated the lines above
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 139-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+* Fri May 20 2022 Sandro Mani <manisandro@gmail.com> - 139-1
+- Set CMAKE_FIND_ROOT_PATH_MODE_PACKAGE in cmake toolchain files
+* Wed May 11 2022 Sandro Mani <manisandro@gmail.com> - 138-1
+- Drop CMAKE_INSTALL_LIBDIR from mingw-cmake macros
+* Mon May 09 2022 Richard Hughes <richard@hughsie.com> 137-1
+- Include glib-mkenums in the toolchain binaries to avoid installing host GLib for building.
+* Tue May 03 2022 Sandro Mani <manisandro@gmail.com> - 136-1
+- Drop standard DLL provides, moved to mingw-crt
-* Fri May 06 2022 Richard W.M. Jones <rjones@redhat.com> - 136-1
+* Tue May 03 2022 Sandro Mani <manisandro@gmail.com> - 135-1
- Rebase to Fedora Rawhide
+- Add host lib dirs to ld.so.conf
-  resolves: rhbz#2080168
-* Sat Apr 23 2022 Konstantin Kostiuk <kkostiuk@redhat.com>
+* Thu Apr 28 2022 Sandro Mani <manisandro@gmail.com> - 134-1
- Fix file conflicts with mingw-pkg-config
+- Regenerate standard-dlls
-  Related: rhbz#2031784
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com>
+* Thu Feb 24 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 133-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Fix ucrt64 toolchain filenames.
-  Related: rhbz#1991688
+* Tue Feb 22 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 133-1
+- Add ucrt64 target. Related to rhbz#2055254.
+* Mon Feb 21 2022 Sandro Mani <manisandro@gmail.com> - 132-1
+- Create build_winXX directories with mkdir -p
+* Thu Feb 10 2022 Sandro Mani <manisandro@gmail.com> - 131-2
+- Bump release
+* Thu Feb 10 2022 Sandro Mani <manisandro@gmail.com> - 131-1
+- Move python dependency generation to mingw32/64_python3.attr in mingw-python3 package
+- More generic mingw_pkg_name macros to also deduce mingw package name from native name
+* Wed Feb 02 2022 Sandro Mani <manisandro@gmail.com> - 130-1
+- Drop evaling $@ in mingw-scripts, ensure mingw macros invoked by mingw-scripts contain $@
+* Sat Jan 22 2022 Sandro Mani <manisandro@gmail.com> - 129-1
+- Also set FCFLAGS in mingw-env
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+* Sat Jan 08 2022 Sandro Mani <manisandro@gmail.com> - 128-1
+- Add Boost_ARCHITECTURE to cmake toolchain file
+* Sat Jan 08 2022 Sandro Mani <manisandro@gmail.com> - 127-1
+- Correctly test whether CC/CXX/FC env-vars are set in cmake toolchain config
+* Wed Dec 15 2021 Sandro Mani <manisandro@gmail.com> - 126-1
+- Preserve CC/CXX/FC/RC set by ENV if set in cmake toolchain files
+* 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
+* Tue Sep 21 2021 Sandro Mani <manisandro@gmail.com> - 123-1
+- Autogenerate mingw-python3 BR
+- Fix mingw{32/64}.attr to also capture pyd, pc files
+* Thu Sep 02 2021 Sandro Mani <manisandro@gmail.com> - 122-1
+- Allow overriding CMake INCLUDE_INSTALL_DIR in MINGWXX_CMAKE_ARGS
+- Drop evaling $@ in mingw-scripts, ensure mingw macros invoked by mingw-scripts contain $@
+* 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
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 * Sat Jun 12 2021 Neal Gompa <ngompa13@gmail.com> - 119-1
 - Use pkgconf for pkgconfig
@@ -385,9 +495,6 @@ echo ".so man1/pkgconf.1" > %{buildroot}%{_mandir}/man1/x86_64-w64-mingw32ucrt-p
 * Mon Jun 07 2021 Sandro Mani <manisandro@gmail.com> - 118-1
 - Allow overriding CFLAGS/CXXFLAGS/LDFLAGS for %%mingw_meson
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com>
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 * Mon Feb 01 2021 Sandro Mani <manisandro@gmail.com> - 117-1
 - Filter Windows API umbrella libraries from requires