From 2b5f03cfd15f3d09eb1f4b921217076b23c2c42252b76c97ded987be28310ad7 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Sun, 20 Feb 2022 11:34:43 +0000
Subject: [PATCH 1/2] Accepting request 922946 from
 home:coolo:branches:openSUSE:Factory

- Add multibuild flavor to split the testsuite out of the main package
  build time. The testsuite dominates the build time and having perl
  in the bootstrap cycle, we better seperate it. The testsuite flavor
  rebuilds the same package the same way, but runs the check section

OBS-URL: https://build.opensuse.org/request/show/922946
OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=208
---
 _multibuild  |  3 +++
 perl.changes |  8 ++++++++
 perl.spec    | 16 ++++++++++++----
 3 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 _multibuild

diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..a0cd1a3
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,3 @@
+<multibuild>
+  <flavor>testsuite</flavor>
+</multibuild>
diff --git a/perl.changes b/perl.changes
index d776297..90981f6 100644
--- a/perl.changes
+++ b/perl.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Oct  4 08:08:30 UTC 2021 - Stephan Kulow <coolo@suse.com>
+
+- Add multibuild flavor to split the testsuite out of the main package
+  build time. The testsuite dominates the build time and having perl
+  in the bootstrap cycle, we better seperate it. The testsuite flavor
+  rebuilds the same package the same way, but runs the check section
+
 -------------------------------------------------------------------
 Thu Sep  2 15:22:45 UTC 2021 - Dirk Stoecker <opensuse@dstoecker.de>
 
diff --git a/perl.spec b/perl.spec
index 1f3baf1..c159aca 100644
--- a/perl.spec
+++ b/perl.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package perl
+# spec file
 #
 # Copyright (c) 2021 SUSE LLC
 #
@@ -16,10 +16,15 @@
 #
 
 
+%define flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" != ""
+%define name_suffix -%{flavor}
+%endif
+
 %define pversion 5.34.0
 # set to %nil when equal to pversion
 %global versionlist %nil
-Name:           perl
+Name:           perl%{?name_suffix}
 Version:        5.34.0
 Release:        0
 Summary:        The Perl interpreter
@@ -27,7 +32,7 @@ License:        Artistic-1.0 OR GPL-1.0-or-later
 Group:          Development/Languages/Perl
 URL:            https://www.perl.org/
 Source:         https://www.cpan.org/src/5.0/perl-%{version}.tar.xz
-Source1:        %{name}-rpmlintrc
+Source1:        perl-rpmlintrc
 Source2:        macros.perl
 Source3:        README.macros
 Source4:        baselibs.conf
@@ -225,7 +230,8 @@ mv savelib lib
 make %{?_smp_mflags}
 
 %check
-%if !0%{?qemu_user_space_build}
+%if "%{name}" == "perl-testsuite" && !0%{?qemu_user_space_build}
+%define _unpackaged_files_terminate_build 0
 TEST_JOBS="%{jobs}" make %{?_smp_mflags} test
 %endif
 
@@ -347,6 +353,7 @@ EOF
    done)
 } > perl-base-excludes
 
+%if "%{name}" == "perl"
 %files base -f perl-base-filelist
 %license Copying Artistic
 %dir /usr/lib/perl5
@@ -373,5 +380,6 @@ EOF
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 %doc /usr/lib/perl5/*/pod
+%endif
 
 %changelog

From d6aa66965b5cf3dc15aaa43e42a9928da6a3ebe76bb0613052a2db243d9a3c16 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Sun, 20 Feb 2022 11:38:23 +0000
Subject: [PATCH 2/2] Refresh patch to apeace download service

OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=209
---
 c029d660f2fe60699cf64bbb3fa9f671a1a370d5.patch | 2 +-
 perl.spec                                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/c029d660f2fe60699cf64bbb3fa9f671a1a370d5.patch b/c029d660f2fe60699cf64bbb3fa9f671a1a370d5.patch
index 0b9192d..bbf07f4 100644
--- a/c029d660f2fe60699cf64bbb3fa9f671a1a370d5.patch
+++ b/c029d660f2fe60699cf64bbb3fa9f671a1a370d5.patch
@@ -12,7 +12,7 @@ gdbm commit d3e27957).
  1 file changed, 5 insertions(+), 6 deletions(-)
 
 diff --git a/ext/GDBM_File/GDBM_File.xs b/ext/GDBM_File/GDBM_File.xs
-index cd0bb6f26ffa..494c2889ca89 100644
+index cd0bb6f26ff..494c2889ca8 100644
 --- a/ext/GDBM_File/GDBM_File.xs
 +++ b/ext/GDBM_File/GDBM_File.xs
 @@ -145,14 +145,13 @@ output_datum(pTHX_ SV *arg, char *str, int size)
diff --git a/perl.spec b/perl.spec
index c159aca..5ffdd7f 100644
--- a/perl.spec
+++ b/perl.spec
@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed