Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mingw32-filesystem for openSUSE:Factory checked in at 2023-03-16 22:57:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mingw32-filesystem (Old) and /work/SRC/openSUSE:Factory/.mingw32-filesystem.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mingw32-filesystem" Thu Mar 16 22:57:31 2023 rev:23 rq:1072199 version:20230309 Changes: -------- --- /work/SRC/openSUSE:Factory/mingw32-filesystem/mingw32-filesystem.changes 2022-11-21 15:30:35.948953985 +0100 +++ /work/SRC/openSUSE:Factory/.mingw32-filesystem.new.31432/mingw32-filesystem.changes 2023-03-16 22:57:49.147305974 +0100 @@ -1,0 +2,20 @@ +Thu Feb 16 12:31:06 UTC 2023 - Ralf Habacker <[email protected]> + +- Update to version 20230309 + * Let cmake macros be based on associated macros from macros.cmake + * Add support to define a custom rpm macro when running mingw32 + related shell scripts, see mingw32-scripts.sh for details + * Drop using external dependency generator (boo#1175587) + * Add mingw32_*.attr files to support actual used dependency generator + * Fix bug that rpm does not use attribute file for cmake by renaming + to mingw32_cmake.attr (rpm does not like '-' in those file name + and keys inside) + * Extend mingw32_cmake.attr to find cmake support files in + share subdirectory as required for example by mingw32-dlfcn-win32 + * Print deprecated message when using %_mingw32_makeinstall or + %__mingw32_cmake + * Reduce some differences to mingw64 in changes and other files, + which are mostly indentions, hours, trailing '/', variable + definition rows - make it easier to compare + +------------------------------------------------------------------- @@ -35 +55 @@ - not adopted due to an additional runtime dependency. + not adopted due to an additional runtime dependency @@ -37 +57 @@ - debug packages. + debug packages @@ -120 +140 @@ -Mon Jul 12 14:28:25 UTC 2021 - Ralf Habacker <[email protected]> +Mon Jul 12 14:30:26 UTC 2021 - Ralf Habacker <[email protected]> @@ -122 +142 @@ -- Add missing provide for ncrypt.dll +- Add provides for ncrypt.dll required by mingw32-gnutls clients Old: ---- mingw32-cmake.attr New: ---- mingw32_binaries.attr mingw32_cmake.attr mingw32_config.attr mingw32_libs.attr mingw32_pkgconfig.attr ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mingw32-filesystem.spec ++++++ --- /var/tmp/diff_new_pack.jpPfmZ/_old 2023-03-16 22:57:50.019310198 +0100 +++ /var/tmp/diff_new_pack.jpPfmZ/_new 2023-03-16 22:57:50.023310218 +0100 @@ -1,7 +1,7 @@ # # spec file for package mingw32-filesystem # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,7 @@ %define _rpmmacrodir %{_sysconfdir}/rpm %endif Name: mingw32-filesystem -Version: 20221115 +Version: 20230309 Release: 0 Summary: MinGW base filesystem and environment License: GPL-2.0-or-later @@ -50,10 +50,15 @@ Source10: languages Source11: languages.man Source12: mingw32-cmake.prov -Source13: mingw32-cmake.attr +Source13: mingw32_cmake.attr Source14: macros.mingw32-cmake Source15: mingw32-filesystem-rpmlintrc Source16: mingw-objdump-srcfiles +Source17: mingw32_binaries.attr +Source18: mingw32_cmake.attr +Source19: mingw32_config.attr +Source20: mingw32_libs.attr +Source21: mingw32_pkgconfig.attr # add excluded system libraries to mingw32-find-requires.sh # TODO: The following provides could be removed after all packages has been rebuild Provides: mingw32(bcrypt.dll) @@ -186,6 +191,12 @@ install -m 0755 %{SOURCE12} %{buildroot}%{_rpmconfigdir} mkdir -p %{buildroot}%{_fileattrsdir} install -m 0644 %{SOURCE13} %{buildroot}%{_fileattrsdir} +# dependency generator support +install -m 0644 %{SOURCE17} %{buildroot}%{_fileattrsdir} +install -m 0644 %{SOURCE18} %{buildroot}%{_fileattrsdir} +install -m 0644 %{SOURCE19} %{buildroot}%{_fileattrsdir} +install -m 0644 %{SOURCE20} %{buildroot}%{_fileattrsdir} +install -m 0644 %{SOURCE21} %{buildroot}%{_fileattrsdir} # Create the locale directories: while read LANG ; do @@ -217,8 +228,8 @@ %_rpmlintdir/mingw32-rpmlint.config %endif -%{_rpmconfigdir}/mingw32-cmake.prov -%{_fileattrsdir}/mingw32-cmake.attr +%{_rpmconfigdir}/mingw32-*.prov +%{_fileattrsdir}/mingw32*.attr %{_bindir}/mingw32-* %{_bindir}/i686-w64-mingw32-* %{_libexecdir}/mingw32-scripts ++++++ macros.mingw32 ++++++ --- /var/tmp/diff_new_pack.jpPfmZ/_old 2023-03-16 22:57:50.143310799 +0100 +++ /var/tmp/diff_new_pack.jpPfmZ/_new 2023-03-16 22:57:50.147310818 +0100 @@ -61,7 +61,8 @@ %_mingw32_cache mingw32-config.cache -# setup rpmbuild hooks +# +# Experimental import library scanning support: # # To provide project wide import library scanning add this to project config # Macros: @@ -71,6 +72,10 @@ # %global _mingw32_find_requires_scan_implibs 1 # to the related spec file # + +# +# Support to exclude shared libraries from generating runtime dependencies +# # To exclude project wide shared library requirements add this to project config # Macros: # %_mingw32_find_requires_exclude d3d12 ... [%{nil}] @@ -79,8 +84,11 @@ # %global _mingw32_find_requires_exclude d3d12 ... [%{nil}] # to the related spec file # -%_mingw32_findprovides /usr/lib/rpm/mingw32-find-provides.sh -%_mingw32_findrequires /usr/lib/rpm/mingw32-find-requires.sh %{?_mingw32_find_requires_exclude:--exclude "%_mingw32_find_requires_exclude"} %{?_mingw32_find_requires_scan_implibs:--scan-implibs} +# see mingw32_reqprov.attr for details + +# +# setup rpmbuild hooks +# %_mingw32_install_post /usr/lib/rpm/mingw32-install-post.sh %_mingw32_find_lang /usr/lib/rpm/mingw32-find-lang.sh %{buildroot} @@ -148,20 +156,13 @@ %_mingw32_package_header \ %global __strip %{_mingw32_strip} \ %global __objdump %{_mingw32_objdump} \ - %global _use_internal_dependency_generator 0 \ - %global __find_requires %{_mingw32_findrequires} \ - %global __find_provides %{_mingw32_findprovides} \ %global __os_install_post %{_mingw32_install_post} - # this macro also disables the default debug package %_mingw32_package_header_debug \ %global debug_package %{nil} \ %global __strip %{_mingw32_strip} \ %global __objdump %{_mingw32_objdump} \ - %global _use_internal_dependency_generator 0 \ - %global __find_requires %{_mingw32_findrequires} \ - %global __find_provides %{_mingw32_findprovides} \ %global __os_install_post %{_mingw32_debug_install_post} \\\ %{_mingw32_install_post} @@ -219,7 +220,9 @@ install # deprecated, use _mingw32_make_install (unix variant is named %make_install) -%_mingw32_makeinstall %_mingw32_make_install +%_mingw32_makeinstall \ + echo "Deprecated %%_mingw32_makeinstall macro used, please use %%_mingw32_make_install" \ + %_mingw32_make_install # requires installed packages wine and mingw32-gdb %_mingw32_gdb %{_mingw32_env} ; \ ++++++ macros.mingw32-cmake ++++++ --- /var/tmp/diff_new_pack.jpPfmZ/_old 2023-03-16 22:57:50.175310954 +0100 +++ /var/tmp/diff_new_pack.jpPfmZ/_new 2023-03-16 22:57:50.175310954 +0100 @@ -1,6 +1,15 @@ -# internal macro used by related filesystem packages -%__mingw32_cmake %{_mingw32_env} ; \ - cmake \\\ +# +# Macros for cmake for mingw32 +# +# depends on macros.cmake +# +%__cmake_generator %{lua: if rpm.expand("%__builder") == rpm.expand("%__make") then print("-G'Unix Makefiles'") else print("-GNinja") end} + +%_mingw32_cmake %{_mingw32_env} ; \ + mkdir -p %__builddir \ + cd %__builddir \ + %__cmake $OLDPWD/%__sourcedir \\\ + %__cmake_generator \\\ -DCMAKE_SYSTEM_NAME="Windows" \\\ -DCMAKE_VERBOSE_MAKEFILE=ON \\\ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \\\ @@ -22,11 +31,19 @@ -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \\\ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -# cmake > 3.13.1 requires setting source dir -%_mingw32_cmake %{__mingw32_cmake} . +%__mingw32_cmake \ + echo "Deprecated %%__mingw32_cmake macro used, please use %%_mingw32_cmake" \ + %{_mingw32_cmake} %_mingw32_cmake_build %cmake_build -%_mingw32_cmake_install %{_mingw32_env} ; \ - make VERBOSE=1 DESTDIR=%{buildroot} install/fast +%_mingw32_cmake_install %{_mingw32_env}; \ + %cmake_install + +%_mingw32_ctest(:-:) \ + cd %__builddir \ + %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %** \ + cd $OLDPWD + +(No newline at EOF) ++++++ mingw32-find-debuginfo.sh ++++++ --- /var/tmp/diff_new_pack.jpPfmZ/_old 2023-03-16 22:57:50.223311186 +0100 +++ /var/tmp/diff_new_pack.jpPfmZ/_new 2023-03-16 22:57:50.227311205 +0100 @@ -1,5 +1,5 @@ #!/bin/sh -#mingw32_find-debuginfo.sh - automagically generate debug info and file list +#mingw32-find-debuginfo.sh - automagically generate debug info and file list #for inclusion in an rpm spec file for mingw32-* packages. # # $PWD package dir below $BUILDDIR @@ -83,7 +83,7 @@ o=`echo $f | sed "s,$BUILDDIR,$destdir,g"` p=`dirname $o` if [ ! -e "$p" ]; then - install -d "$p" + install -d "$p" fi echo copying $f to $o install -m 644 $f $o ++++++ mingw32-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.jpPfmZ/_old 2023-03-16 22:57:50.283311477 +0100 +++ /var/tmp/diff_new_pack.jpPfmZ/_new 2023-03-16 22:57:50.287311496 +0100 @@ -23,5 +23,8 @@ # This group is used a lot, so ignore the warning about it. addFilter ("^mingw32-.*non-standard-group Development/Libraries$") +# using /opt/testing +addFilter("^mingw32-*filelist-forbidden-opt") + addFilter("^mingw32-.*potential-bashisms") ++++++ mingw32-scripts.sh ++++++ --- /var/tmp/diff_new_pack.jpPfmZ/_old 2023-03-16 22:57:50.311311612 +0100 +++ /var/tmp/diff_new_pack.jpPfmZ/_new 2023-03-16 22:57:50.315311632 +0100 @@ -3,6 +3,7 @@ # mingw32-scripts # Copyright (C) 2008 Red Hat Inc., Richard W.M. Jones. # Copyright (C) 2008 Levente Farkas +# Copyright (C) 2023 Ralf Habacker # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,8 +21,17 @@ # MA 02110-1301 USA. # This is a useful command-line script through which one can use the -# macros from mingw32-macros.mingw32 cross-compilation. +# macros from mingw32-macros.mingw32 cross-compilation. +# +# It supports the environment variable MINGW32_MACROS=<value> to be +# able to override individual rpm macros. With +# +# MINGW32_MACROS='__cmake ~/bin/cmake' mingw32-cmake +# +# for example, the specified cmake executable is used instead of +# the internal default. NAME="_`basename $0|tr -- - _`" -eval "`rpm --eval "%${NAME} $(printf " %q" "${@}")"`" +DEFINE=${MINGW32_MACROS:+--define="${MINGW32_MACROS}"} +eval "`rpm "${DEFINE}" --eval "%${NAME} $(printf " %q" "${@}")"`" ++++++ mingw32_binaries.attr ++++++ %__mingw32_binaries_provides %{_rpmconfigdir}/mingw32-find-provides.sh %__mingw32_binaries_requires %{_rpmconfigdir}/mingw32-find-requires.sh %{?_mingw32_find_requires_exclude:--exclude "%_mingw32_find_requires_exclude"} %__mingw32_binaries_magic PE32 executable ++++++ mingw32_cmake.attr ++++++ %__mingw32_cmake_provides %{_rpmconfigdir}/mingw32-cmake.prov %__mingw32_cmake_path ^(%{_mingw32_libdir}/cmake|%{_mingw32_datadir})/.*/.*(Config\.cmake|-config\.cmake)$ ++++++ mingw32_config.attr ++++++ %__mingw32_config_requires %{_rpmconfigdir}/mingw32-find-requires.sh %{?_mingw32_find_requires_exclude:--exclude "%_mingw32_find_requires_exclude"} %__mingw32_config_path ^%{_mingw32_bindir}/.*config$ ++++++ mingw32_libs.attr ++++++ %__mingw32_libs_provides %{_rpmconfigdir}/mingw32-find-provides.sh %__mingw32_libs_requires %{_rpmconfigdir}/mingw32-find-requires.sh %{?_mingw32_find_requires_exclude:--exclude "%_mingw32_find_requires_exclude"} %{?_mingw32_find_requires_scan_implibs:--scan-implibs} %__mingw32_libs_path ^(%{_mingw32_libdir}/.*\.a)$ ++++++ mingw32_pkgconfig.attr ++++++ %__mingw32_pkgconfig_provides %{_rpmconfigdir}/mingw32-find-provides.sh %__mingw32_pkgconfig_requires %{_rpmconfigdir}/mingw32-find-requires.sh %{?_mingw32_find_requires_exclude:--exclude "%_mingw32_find_requires_exclude"} %__mingw32_pkgconfig_path ^(%{_mingw32_datadir}|%{_mingw32_libdir})/pkgconfig/.*\.pc$
