- Changelog date order

- Typo

pungi.spec

@@ -2,7 +2,7 @@
 
 Name:           pungi
 Version:        4.7.0
-Release:        5%{?dist}.alma
+Release:        6%{?dist}.alma.1
 Summary:        Distribution compose tool
 
 License:        GPL-2.0-only
@@ -174,6 +174,9 @@ rm %{buildroot}%{_bindir}/pungi
 %{_bindir}/%{name}-cache-cleanup
 
 %changelog
+* Fri Sep 27 2024 Stepan Oksanichenko <soksanichenko@almalinux.org> - 4.7.0-6
+- Add x86_64_v2 to a list of exclusive arches if there is any arch with base `x86_64`
+
 * Mon Sep 16 2024 Eduard Abdullin <eabdullin@almalinux.org> - 4.7.0-5
 - Add x86_64_v2 to arch list if x86_64 in list
 
@@ -287,15 +290,15 @@ rm %{buildroot}%{_bindir}/pungi
 - Fix minor Ruff/flake8 warnings (tim)
 - osbuild: manifest type in config (cmdr)
 
-* Mon Sep 25 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.5.0-7
-- Backport patch for explicit setting of osbuild image type in metadata
-
 * Mon Nov 21 2023 Stepan Oksanichenko <soksanichenko@almalinux.org> - 4.5.0-3
 - Method `get_remote_file_content` is object's method now
 
 * Wed Nov 15 2023 Stepan Oksanichenko <soksanichenko@almalinux.org> - 4.5.0-2
 - Return empty list if a repo doesn't contain any module
 
+* Mon Sep 25 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.5.0-7
+- Backport patch for explicit setting of osbuild image type in metadata
+
 * Thu Aug 31 2023 Lubomír Sedlář <lsedlar@redhat.com> - 4.5.0-1
 - kojiwrapper: Stop being smart about local access (lsedlar)
 - Fix unittest errors (ounsal)

pungi/arch.py

@@ -93,7 +93,9 @@ def split_name_arch(name_arch):
 
 def is_excluded(package, arches, logger=None):
     """Check if package is excluded from given architectures."""
-    if package.arch == 'x86_64_v2' and 'x86_64' in package.exclusivearch:
+    if any(
+        getBaseArch(exc_arch) == 'x86_64' for exc_arch in package.exclusivearch
+    ) and 'x86_64_v2' not in package.exclusivearch:
         package.exclusivearch.append('x86_64_v2')
 
     if package.excludearch and set(package.excludearch) & set(arches):