From 517ab42b7fb879e15eeb83d130fc3d2ff7cee339 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sat, 1 Jun 2024 17:32:42 +0200
Subject: Fix building test pkgs with rpm-4.20

---
 Changes                                   | 1 +
 t/data/SPECS/arch_to_noarch_1.spec        | 2 ++
 t/data/SPECS/arch_to_noarch_2.spec        | 2 ++
 t/data/SPECS/arch_to_noarch_4.spec        | 2 ++
 t/data/SPECS/buildroot_default.spec       | 2 ++
 t/data/SPECS/i586-to-i686/libfoobar.spec  | 4 ++++
 t/data/SPECS/multi-line-macro.spec        | 2 ++
 t/data/SPECS/multi-line-macro2.spec       | 2 ++
 t/data/SPECS/obsolete-and-conflict/a.spec | 3 +++
 t/data/SPECS/obsolete-and-conflict/b.spec | 3 +++
 t/data/SPECS/obsolete-and-conflict/c.spec | 2 ++
 t/data/SPECS/various.spec                 | 2 ++
 t/data/SPECS/various2.spec                | 2 ++
 t/data/SPECS/various3.spec                | 2 ++
 14 files changed, 31 insertions(+)

diff --git a/Changes b/Changes
index b1efadad..628d36f9 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
 - testsuite:
   o list some missing spec files in MANIFEST
+  o Fix building test pkgs with rpm-4.20
 
 Version 8.133 - 31 May 2024
 
diff --git a/t/data/SPECS/arch_to_noarch_1.spec b/t/data/SPECS/arch_to_noarch_1.spec
index 36b059f1..37e0b1fa 100644
--- a/t/data/SPECS/arch_to_noarch_1.spec
+++ b/t/data/SPECS/arch_to_noarch_1.spec
@@ -1,5 +1,7 @@
 # For CPAN testers that run FreeBSD:
 %global __brp_strip_static_archive %nil
+# Fix build with rpm-4.20:
+%global debug_package %{nil}
 
 Summary: arch_to_noarch
 Name: arch_to_noarch
diff --git a/t/data/SPECS/arch_to_noarch_2.spec b/t/data/SPECS/arch_to_noarch_2.spec
index 39d73f39..a331caa2 100644
--- a/t/data/SPECS/arch_to_noarch_2.spec
+++ b/t/data/SPECS/arch_to_noarch_2.spec
@@ -1,5 +1,7 @@
 # For CPAN testers that run FreeBSD:
 %global __brp_strip_static_archive %nil
+# Fix build with rpm-4.20:
+%global debug_package %{nil}
 
 Summary: arch_to_noarch
 Name: arch_to_noarch
diff --git a/t/data/SPECS/arch_to_noarch_4.spec b/t/data/SPECS/arch_to_noarch_4.spec
index 369f2aef..518bf4df 100644
--- a/t/data/SPECS/arch_to_noarch_4.spec
+++ b/t/data/SPECS/arch_to_noarch_4.spec
@@ -1,5 +1,7 @@
 # For CPAN testers that run FreeBSD:
 %global __brp_strip_static_archive %nil
+# Fix build with rpm-4.20:
+%global debug_package %{nil}
 
 Summary: arch_to_noarch
 Name: arch_to_noarch
diff --git a/t/data/SPECS/buildroot_default.spec b/t/data/SPECS/buildroot_default.spec
index 33cfc763..c555ea04 100644
--- a/t/data/SPECS/buildroot_default.spec
+++ b/t/data/SPECS/buildroot_default.spec
@@ -1,6 +1,8 @@
 %define macro_using_buildroot $(echo %buildroot)
 %undefine distepoch
 %undefine disttag
+# Fix build with rpm-4.20:
+%global debug_package %{nil}
 
 Summary: x
 Name: buildroot
diff --git a/t/data/SPECS/i586-to-i686/libfoobar.spec b/t/data/SPECS/i586-to-i686/libfoobar.spec
index 3d7b9436..bb322414 100644
--- a/t/data/SPECS/i586-to-i686/libfoobar.spec
+++ b/t/data/SPECS/i586-to-i686/libfoobar.spec
@@ -6,6 +6,10 @@
 # Which are the pkgs actually used by the testsuite for simulating an i586 to
 # i686 upgrade
 
+# Fix build with rpm-4.20:
+%global debug_package %{nil}
+
+
 # we could build with -static but then pkg goes up from 8.5kb to 280Kb:
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}libc.so
 Summary: x
diff --git a/t/data/SPECS/multi-line-macro.spec b/t/data/SPECS/multi-line-macro.spec
index 06e8eb95..9b0f36d7 100644
--- a/t/data/SPECS/multi-line-macro.spec
+++ b/t/data/SPECS/multi-line-macro.spec
@@ -1,3 +1,5 @@
+# Fix build with rpm-4.20:
+%global debug_package %{nil}
 %define foobar /etc/foo \
                /etc/bar
 
diff --git a/t/data/SPECS/multi-line-macro2.spec b/t/data/SPECS/multi-line-macro2.spec
index 8dddbf92..2d1a7418 100644
--- a/t/data/SPECS/multi-line-macro2.spec
+++ b/t/data/SPECS/multi-line-macro2.spec
@@ -1,3 +1,5 @@
+# Fix build with rpm-4.20:
+%global debug_package %{nil}
 %define foobar echo foo > $RPM_BUILD_ROOT/etc/foo \
                echo bar > $RPM_BUILD_ROOT/etc/bar
 
diff --git a/t/data/SPECS/obsolete-and-conflict/a.spec b/t/data/SPECS/obsolete-and-conflict/a.spec
index f15a27e0..dbb0ebb2 100644
--- a/t/data/SPECS/obsolete-and-conflict/a.spec
+++ b/t/data/SPECS/obsolete-and-conflict/a.spec
@@ -1,3 +1,6 @@
+# Fix build with rpm-4.20:
+%global debug_package %{nil}
+
 Summary: a
 Name: a
 Version: 1
diff --git a/t/data/SPECS/obsolete-and-conflict/b.spec b/t/data/SPECS/obsolete-and-conflict/b.spec
index 96aa265b..2bf98a5c 100644
--- a/t/data/SPECS/obsolete-and-conflict/b.spec
+++ b/t/data/SPECS/obsolete-and-conflict/b.spec
@@ -1,3 +1,6 @@
+# Fix build with rpm-4.20:
+%global debug_package %{nil}
+
 Summary: b
 Name: b
 Version: 1
diff --git a/t/data/SPECS/obsolete-and-conflict/c.spec b/t/data/SPECS/obsolete-and-conflict/c.spec
index 2cacfc00..c18c03df 100644
--- a/t/data/SPECS/obsolete-and-conflict/c.spec
+++ b/t/data/SPECS/obsolete-and-conflict/c.spec
@@ -1,3 +1,5 @@
+# Fix build with rpm-4.20:
+%global debug_package %{nil}
 Summary: c
 Name: c
 Version: 1
diff --git a/t/data/SPECS/various.spec b/t/data/SPECS/various.spec
index 250f737c..5cf933f8 100644
--- a/t/data/SPECS/various.spec
+++ b/t/data/SPECS/various.spec
@@ -1,3 +1,5 @@
+# Fix build with rpm-4.20:
+%global debug_package %{nil}
 Summary: various
 Name: various
 Version: 1
diff --git a/t/data/SPECS/various2.spec b/t/data/SPECS/various2.spec
index 6a10084c..a14d786d 100644
--- a/t/data/SPECS/various2.spec
+++ b/t/data/SPECS/various2.spec
@@ -1,3 +1,5 @@
+# Fix build with rpm-4.20:
+%global debug_package %{nil}
 Summary: various2
 Name: various2
 Version: 1
diff --git a/t/data/SPECS/various3.spec b/t/data/SPECS/various3.spec
index 74e08459..5a061f52 100644
--- a/t/data/SPECS/various3.spec
+++ b/t/data/SPECS/various3.spec
@@ -1,3 +1,5 @@
+# Fix build with rpm-4.20:
+%global debug_package %{nil}
 Summary: various3
 Name: various3
 Version: 1
-- 
cgit v1.2.1