Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mingw64-filesystem for
openSUSE:Factory checked in at 2023-03-16 22:57:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mingw64-filesystem (Old)
and /work/SRC/openSUSE:Factory/.mingw64-filesystem.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mingw64-filesystem"
Thu Mar 16 22:57:35 2023 rev:23 rq:1072200 version:20230309
Changes:
--------
--- /work/SRC/openSUSE:Factory/mingw64-filesystem/mingw64-filesystem.changes
2022-11-21 15:30:38.928969114 +0100
+++
/work/SRC/openSUSE:Factory/.mingw64-filesystem.new.31432/mingw64-filesystem.changes
2023-03-16 22:57:50.751313744 +0100
@@ -1,0 +2,20 @@
+Thu Feb 16 12:31:06 UTC 2023 - Ralf Habacker <ralf.habac...@freenet.de>
+
+- 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 mingw64
+ related shell scripts, see mingw64-scripts.sh for details
+ * Drop using external dependency generator (boo#1175587)
+ * Add mingw64_*.attr files to support actual used dependency generator
+ * Fix bug that rpm does not use attribute file for cmake by renaming
+ to mingw64_cmake.attr (rpm does not like '-' in those file name
+ and keys inside)
+ * Extend mingw64_cmake.attr to find cmake support files in
+ share subdirectory as required for example by mingw64-dlfcn-win32
+ * Print deprecated message when using %_mingw64_makeinstall or
+ %__mingw64_cmake
+ * Reduce some differences to mingw32 in changes and other files,
+ which are mostly indentions, hours, trailing '/', variable
+ definition rows - make it easier to compare
+
+-------------------------------------------------------------------
@@ -9 +29 @@
-------------------------------------------------------------------
+-------------------------------------------------------------------
@@ -35 +55 @@
- not adopted due to an additional runtime dependency.
+ not adopted due to an additional runtime dependency
@@ -37 +57 @@
- debug packages.
+ debug packages
@@ -40,2 +60,2 @@
-- Exclude 'mlang.dll' from automatic runtime library detection required
- for win_iconv package
+- Exclude 'mlang.dll' and other dll's from automatic runtime library
+ detection required for win_iconv and libqt5 packages
@@ -93 +113 @@
-Thu Dec 2 14:04:48 UTC 2021 - Dominique Leuenberger <dims...@opensuse.org>
+Thu Dec 2 14:06:40 UTC 2021 - Dominique Leuenberger <dims...@opensuse.org>
@@ -138 +158 @@
-- In mingw64-scripts support rpm macro processing to
+- In mingw64-scripts support rpm macro processing according to
@@ -142,5 +161,0 @@
-Sun Nov 1 10:38:47 UTC 2020 - Ralf Habacker <ralf.habac...@freenet.de>
-
-- Add macro _mingw64_gdb and command line wrapper /usr/bin/mingw64-gdb
-
--------------------------------------------------------------------
@@ -197 +212 @@
-Wed Dec 18 21:49:44 UTC 2019 - Martin Koegler <martin.koeg...@chello.at>
+Wed Dec 18 21:49:04 UTC 2019 - Martin Koegler <martin.koeg...@chello.at>
@@ -217,0 +233,5 @@
+
+-------------------------------------------------------------------
+Sun Nov 24 21:36:08 UTC 2019 - Ralf Habacker <ralf.habac...@freenet.de>
+
+- fix compile errors: undefined reference to `__memcpy_chk`
Old:
----
mingw64-cmake.attr
New:
----
mingw64_binaries.attr
mingw64_cmake.attr
mingw64_config.attr
mingw64_libs.attr
mingw64_pkgconfig.attr
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mingw64-filesystem.spec ++++++
--- /var/tmp/diff_new_pack.IxiOfB/_old 2023-03-16 22:57:51.507317405 +0100
+++ /var/tmp/diff_new_pack.IxiOfB/_new 2023-03-16 22:57:51.511317425 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mingw64-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: mingw64-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: mingw64-cmake.prov
-Source13: mingw64-cmake.attr
+Source13: mingw64_cmake.attr
Source14: macros.mingw64-cmake
Source15: mingw64-filesystem-rpmlintrc
Source16: mingw-objdump-srcfiles
+Source17: mingw64_binaries.attr
+Source18: mingw64_cmake.attr
+Source19: mingw64_config.attr
+Source20: mingw64_libs.attr
+Source21: mingw64_pkgconfig.attr
# add excluded system libraries to mingw64-find-requires.sh
# TODO: The following provides could be removed after all packages has been
rebuild
Provides: mingw64(bcrypt.dll)
@@ -114,13 +119,13 @@
# but including macros.mingw64 results into an unknown failure
mkdir -p %{buildroot}%{_bindir}
pushd %{buildroot}%{_bindir}
-for i in mingw64-configure mingw64-make mingw64-cmake mingw64-gdb ; do
+for i in mingw64-configure mingw64-make mingw64-cmake mingw64-gdb; do
ln -s %{_libexecdir}/mingw64-scripts $i
done
popd
mkdir -p %{buildroot}%{_distconfdir}/profile.d
-install -m 644 %{SOURCE2} %{buildroot}%{_distconfdir}/profile.d
+install -m 644 %{SOURCE2} %{buildroot}%{_distconfdir}/profile.d/
mkdir -p %{buildroot}%{_rpmmacrodir}
install -m 644 %{SOURCE1} %{buildroot}%{_rpmmacrodir}/macros.mingw64
@@ -182,11 +187,16 @@
install -m 0755 %{SOURCE5} %{buildroot}%{_rpmconfigdir}
install -m 0755 %{SOURCE8} %{buildroot}%{_rpmconfigdir}
install -m 0755 %{SOURCE9} %{buildroot}%{_rpmconfigdir}
-
# cmake support
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 +227,9 @@
%else
%_rpmlintdir/mingw64-rpmlint.config
%endif
-%{_rpmconfigdir}/mingw64-cmake.prov
-%{_fileattrsdir}/mingw64-cmake.attr
+
+%{_rpmconfigdir}/mingw64-*.prov
+%{_fileattrsdir}/mingw64*.attr
%{_bindir}/mingw64-*
%{_bindir}/x86_64-w64-mingw32-*
%{_libexecdir}/mingw64-scripts
++++++ macros.mingw64 ++++++
--- /var/tmp/diff_new_pack.IxiOfB/_old 2023-03-16 22:57:51.631318006 +0100
+++ /var/tmp/diff_new_pack.IxiOfB/_new 2023-03-16 22:57:51.631318006 +0100
@@ -28,7 +28,7 @@
%_mingw64_cxxflags %{_mingw64_cflags}
%_mingw64_ldflags_base -Wl,--exclude-libs=libintl.a
-Wl,--exclude-libs=libiconv.a -Wl,--no-keep-memory
-# used for bootstrap packages
+# for bootstrap packages
%_mingw64_ldflags_bootstrap %{_mingw64_ldflags_base}
# for normal packages
%_mingw64_ldflags %{_mingw64_ldflags_base} -fstack-protector
@@ -61,7 +61,8 @@
%_mingw64_cache mingw64-config.cache
-# setup rpmbuild hooks
+#
+# Experimental import library scanning support:
#
# To provide project wide import library scanning add this to project config
# Macros:
@@ -71,16 +72,23 @@
# %global _mingw64_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:
-# %_mingw64_find_requires_exclude d3d12 ... [%{nil}]
+# %_mingw64_find_requires_exclude d3d12 ... [%{nil}]
# :Macros
# for a single package add
# %global _mingw64_find_requires_exclude d3d12 ... [%{nil}]
# to the related spec file
#
-%_mingw64_findprovides /usr/lib/rpm/mingw64-find-provides.sh
-%_mingw64_findrequires /usr/lib/rpm/mingw64-find-requires.sh
%{?_mingw64_find_requires_exclude:--exclude "%_mingw64_find_requires_exclude"}
%{?_mingw64_find_requires_scan_implibs:--scan-implibs}
+# see mingw64_*.attr for details
+
+#
+# setup rpmbuild hooks
+#
%_mingw64_install_post /usr/lib/rpm/mingw64-install-post.sh
%_mingw64_find_lang /usr/lib/rpm/mingw64-find-lang.sh %{buildroot}
@@ -88,7 +96,7 @@
/usr/lib/rpm/mingw64-find-debuginfo.sh %{_builddir} 1\
%{nil}
-# Template for debug sub-package.
+# Template for combined debuginfo and debugsource sub-package.
%_mingw64_debug_package(n:) \
%package %{-n:-n %{-n*}-}debug \
Summary: Debug information for package %{name} \
@@ -148,9 +156,6 @@
%_mingw64_package_header \
%global __strip %{_mingw64_strip} \
%global __objdump %{_mingw64_objdump} \
- %global _use_internal_dependency_generator 0 \
- %global __find_requires %{_mingw64_findrequires} \
- %global __find_provides %{_mingw64_findprovides} \
%global __os_install_post %{_mingw64_install_post}
# this macro also disables the default debug package
@@ -158,9 +163,6 @@
%global debug_package %{nil} \
%global __strip %{_mingw64_strip} \
%global __objdump %{_mingw64_objdump} \
- %global _use_internal_dependency_generator 0 \
- %global __find_requires %{_mingw64_findrequires} \
- %global __find_provides %{_mingw64_findprovides} \
%global __os_install_post %{_mingw64_debug_install_post} \\\
%{_mingw64_install_post}
@@ -218,9 +220,11 @@
install
# deprecated, use _mingw64_make_install (unix variant is named %make_install)
-%_mingw64_makeinstall %_mingw64_make_install
+%_mingw64_makeinstall \
+ echo "Deprecated %%_mingw64_makeinstall macro used, please use
%%_mingw64_make_install" \
+ %_mingw64_make_install
-# requires installed packaged wine and mingw64-gdb
+# requires installed packages wine and mingw64-gdb
%_mingw64_gdb %{_mingw64_env} ; \
wineconsole %{_mingw64_bindir}/gdb.exe
++++++ macros.mingw64-cmake ++++++
--- /var/tmp/diff_new_pack.IxiOfB/_old 2023-03-16 22:57:51.655318123 +0100
+++ /var/tmp/diff_new_pack.IxiOfB/_new 2023-03-16 22:57:51.659318142 +0100
@@ -1,6 +1,15 @@
-# internal macro used by related filesystem packages
-%__mingw64_cmake %{_mingw64_env} ; \
- cmake \\\
+#
+# Macros for cmake for mingw64
+#
+# depends on macros.cmake
+#
+%__cmake_generator %{lua: if rpm.expand("%__builder") == rpm.expand("%__make")
then print("-G'Unix Makefiles'") else print("-GNinja") end}
+
+%_mingw64_cmake %{_mingw64_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
-%_mingw64_cmake %{__mingw64_cmake} .
+%__mingw64_cmake \
+ echo "Deprecated %%__mingw64_cmake macro used, please use %%_mingw64_cmake"
\
+ %{_mingw64_cmake}
%_mingw64_cmake_build %cmake_build
-%_mingw64_cmake_install %{_mingw64_env} ; \
- make VERBOSE=1 DESTDIR=%{buildroot} install/fast
+%_mingw64_cmake_install %{_mingw64_env}; \
+ %cmake_install
+
+%_mingw64_ctest(:-:) \
+ cd %__builddir \
+ %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} %**
\
+ cd $OLDPWD
+
+(No newline at EOF)
++++++ mingw64-find-debuginfo.sh ++++++
--- /var/tmp/diff_new_pack.IxiOfB/_old 2023-03-16 22:57:51.715318413 +0100
+++ /var/tmp/diff_new_pack.IxiOfB/_new 2023-03-16 22:57:51.719318433 +0100
@@ -1,18 +1,21 @@
#!/bin/sh
#mingw64-find-debuginfo.sh - automagically generate debug info and file list
#for inclusion in an rpm spec file for mingw64-* packages.
+#
+# $PWD package dir below $BUILDDIR
+
target="mingw64"
host="x86_64-w64-mingw32"
+# speed up running objdump, see bug
https://bugzilla.opensuse.org/show_bug.cgi?id=1202431
+export MALLOC_CHECK_=0
+export MALLOC_PERTURB_=0
+
BUILDDIR=.
if [ -n "$1" ]; then
BUILDDIR="$1"
fi
-# speed up running objdump, see bug
https://bugzilla.opensuse.org/show_bug.cgi?id=1202431
-export MALLOC_CHECK_=0
-export MALLOC_PERTURB_=0
-
# generate separate debuginfo and debugsource or single debug package
combining both
if [ -n "$2" ]; then
SINGLE_DEBUG_PACKAGE=1
@@ -62,7 +65,7 @@
-or -name "*.exe.mdb" \
-or -name "*.dll.mdb" \
| sort \
-| sed -n -e "s#^$RPM_BUILD_ROOT##p" >"$BUILDDIR/$target-debugfiles.list"
+| sed -n -e "s#^$RPM_BUILD_ROOT##p" > $BUILDDIR/$target-debugfiles.list
echo creating debugsource file structure
++++++ mingw64-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.IxiOfB/_old 2023-03-16 22:57:51.775318704 +0100
+++ /var/tmp/diff_new_pack.IxiOfB/_new 2023-03-16 22:57:51.783318742 +0100
@@ -1,3 +1,5 @@
+# not used on Leap 15.x for linting mingw64-filesystem package
+
# Unconditionally remove devel-file-in-non-devel rpmlint warning.
addFilter ("^mingw64-.*devel-file-in-non-devel")
++++++ mingw64-scripts.sh ++++++
--- /var/tmp/diff_new_pack.IxiOfB/_old 2023-03-16 22:57:51.811318878 +0100
+++ /var/tmp/diff_new_pack.IxiOfB/_new 2023-03-16 22:57:51.815318897 +0100
@@ -3,6 +3,7 @@
# mingw64-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 mingw64-macros.mingw64 cross-compilation.
+# macros from mingw64-macros.mingw64 cross-compilation.
+#
+# It supports the environment variable MINGW64_MACROS=<value> to be
+# able to override individual rpm macros. With
+#
+# MINGW64_MACROS='__cmake ~/bin/cmake' mingw64-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=${MINGW64_MACROS:+--define="${MINGW64_MACROS}"}
+eval "`rpm "${DEFINE}" --eval "%${NAME} $(printf " %q" "${@}")"`"
++++++ mingw64_binaries.attr ++++++
%__mingw64_binaries_provides %{_rpmconfigdir}/mingw64-find-provides.sh
%__mingw64_binaries_requires %{_rpmconfigdir}/mingw64-find-requires.sh
%{?_mingw64_find_requires_exclude:--exclude "%_mingw64_find_requires_exclude"}
%__mingw64_binaries_magic PE32[+] executable
++++++ mingw64_cmake.attr ++++++
%__mingw64_cmake_provides %{_rpmconfigdir}/mingw64-cmake.prov
%__mingw64_cmake_path
^(%{_mingw64_libdir}/cmake|%{_mingw64_datadir})/.*/.*(Config\.cmake|-config\.cmake)$
++++++ mingw64_config.attr ++++++
%__mingw64_config_requires %{_rpmconfigdir}/mingw64-find-requires.sh
%{?_mingw64_find_requires_exclude:--exclude "%_mingw64_find_requires_exclude"}
%__mingw64_config_path ^%{_mingw64_bindir}/.*config$
++++++ mingw64_libs.attr ++++++
%__mingw64_libs_provides %{_rpmconfigdir}/mingw64-find-provides.sh
%__mingw64_libs_requires %{_rpmconfigdir}/mingw64-find-requires.sh
%{?_mingw64_find_requires_exclude:--exclude "%_mingw64_find_requires_exclude"}
%{?_mingw64_find_requires_scan_implibs:--scan-implibs}
%__mingw64_libs_path ^(%{_mingw64_libdir}/.*\.a)$
++++++ mingw64_pkgconfig.attr ++++++
%__mingw64_pkgconfig_provides %{_rpmconfigdir}/mingw64-find-provides.sh
%__mingw64_pkgconfig_requires %{_rpmconfigdir}/mingw64-find-requires.sh
%{?_mingw64_find_requires_exclude:--exclude "%_mingw64_find_requires_exclude"}
%__mingw64_pkgconfig_path
^(%{_mingw64_datadir}|%{_mingw64_libdir})/pkgconfig/.*\.pc$
