Notification time stamped 2022-02-22 09:34:41 UTC
From 03aa020c111ff4ec6a81409eb0f87e6e1b3d8c23 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro(a)gmail.com>
Date: Feb 10 2022 10:37:08 +0000
Subject: More generic mingw_pkg_name macros to also deduce mingw package name from native
name
---
diff --git a/macros.mingw32 b/macros.mingw32
index e791e03..040e808 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -1,6 +1,6 @@
# RPM macros for Fedora MinGW.
-%mingw32_pkg_name %(echo %{name} | sed 's/^mingw-/mingw32-/')
+%mingw32_pkg_name %(echo %{name} | sed -E 's/^(mingw-|)/mingw32-/')
%mingw32_target i686-w64-mingw32
# Paths.
diff --git a/macros.mingw64 b/macros.mingw64
index 81c10aa..896b290 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -1,6 +1,6 @@
# RPM macros for Fedora MinGW.
-%mingw64_pkg_name %(echo %{name} | sed 's/^mingw-/mingw64-/')
+%mingw64_pkg_name %(echo %{name} | sed -E 's/^(mingw-|)/mingw64-/')
%mingw64_target x86_64-w64-mingw32
# Paths.
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 044f54a..c530dfc 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: 130
+Version: 131
Release: 1%{?dist}
Summary: MinGW cross compiler base filesystem and environment
@@ -358,6 +358,9 @@ echo ".so man1/pkgconf.1" >
%{buildroot}%{_mandir}/man1/x86_64-w64-mingw32-pkg-c
%changelog
+* Thu Feb 10 2022 Sandro Mani <manisandro(a)gmail.com> - 131-1
+- More generic mingw_pkg_name macros to also deduce mingw package name from native name
+
* Wed Feb 02 2022 Sandro Mani <manisandro(a)gmail.com> - 130-1
- Drop evaling $@ in mingw-scripts, ensure mingw macros invoked by mingw-scripts contain
$@
https://src.fedoraproject.org/rpms/mingw-filesystem/c/03aa020c111ff4ec6a8...