From 1b7b1e6d8eddf8ddad163a10bbdf7022d72316fc Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Thu, 27 Jul 2023 14:42:59 +0200
Subject: [PATCH] Resolves: rhbz#2219504 - Replace versioned MODULE_COMPAT by
 non-versioned perl-libs

---
 .fmf/version              |  1 +
 gating.yaml               |  7 +++++++
 perl-Date-Manip.spec      | 39 +++++++++++++++++++++++++++++++++++++--
 plans/sanity.fmf          |  5 +++++
 tests/bz_2219504-check.sh |  9 +++++++++
 tests/bz_2219504.fmf      | 15 +++++++++++++++
 tests/upstream-tests.fmf  |  8 ++++++++
 7 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 .fmf/version
 create mode 100644 gating.yaml
 create mode 100644 plans/sanity.fmf
 create mode 100755 tests/bz_2219504-check.sh
 create mode 100644 tests/bz_2219504.fmf
 create mode 100644 tests/upstream-tests.fmf

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..805e877
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,7 @@
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
diff --git a/perl-Date-Manip.spec b/perl-Date-Manip.spec
index 9cfe39d..4caeec9 100644
--- a/perl-Date-Manip.spec
+++ b/perl-Date-Manip.spec
@@ -1,6 +1,6 @@
 Name:           perl-Date-Manip
 Version:        6.60
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Date manipulation routines
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -11,6 +11,7 @@ BuildArch:      noarch
 BuildRequires:  make
 BuildRequires:  perl-interpreter
 BuildRequires:  perl-generators
+BuildRequires:  perl(Config)
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
 BuildRequires:  perl(strict)
 BuildRequires:  perl(warnings)
@@ -29,7 +30,7 @@ BuildRequires:  perl(utf8)
 # Tests only
 BuildRequires:  perl(Test::Inter)
 BuildRequires:  perl(Test::More)
-Requires:       perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
+Requires:       perl-libs
 Requires:       perl(Cwd)
 Requires:       perl(File::Find)
 Requires:       perl(File::Spec)
@@ -48,9 +49,24 @@ are all easily done. It deals with time as it is used in the Gregorian
 calendar (the one currently in use) with full support for time changes due
 to daylight saving time.
 
+%package tests
+Summary:        Tests for %{name}
+Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       perl-Test-Harness
+
+%description tests
+Tests from %{name}. Execute them
+with "%{_libexecdir}/%{name}/test".
+
 %prep
 %setup -q -n Date-Manip-%{version}
 
+# Help generators to recognize Perl scripts
+for F in t/*.t; do
+    perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!.*perl\b}{$Config{startperl}}' "$F"
+    chmod +x "$F"
+done
+
 %build
 perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
 make %{?_smp_mflags}
@@ -59,6 +75,17 @@ make %{?_smp_mflags}
 make pure_install DESTDIR=%{buildroot}
 %{_fixperms} %{buildroot}/*
 
+# Install tests
+mkdir -p %{buildroot}%{_libexecdir}/%{name}
+cp -a t %{buildroot}%{_libexecdir}/%{name}
+# Remove release tests
+rm -f %{buildroot}%{_libexecdir}/%{name}/t/pod*
+cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
+#!/bin/sh
+cd %{_libexecdir}/%{name} && exec prove -I . -j "$(getconf _NPROCESSORS_ONLN)"
+EOF
+chmod +x %{buildroot}%{_libexecdir}/%{name}/test
+
 %check
 make test
 
@@ -69,7 +96,15 @@ make test
 %{_mandir}/man[13]/*.[13]*
 %{_bindir}/dm_*
 
+%files tests
+%{_libexecdir}/%{name}
+
 %changelog
+* Thu Jul 20 2023 Jitka Plesnikova <jplesnik@redhat.com> - 6.60-3
+- Replace versioned MODULE_COMPAT by non-versioned perl-libs
+- Package tests
+- Resolves: rhbz#2219504
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.60-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/plans/sanity.fmf b/plans/sanity.fmf
new file mode 100644
index 0000000..a72ded4
--- /dev/null
+++ b/plans/sanity.fmf
@@ -0,0 +1,5 @@
+summary: Sanity tests
+discover:
+    how: fmf
+execute:
+    how: tmt
diff --git a/tests/bz_2219504-check.sh b/tests/bz_2219504-check.sh
new file mode 100755
index 0000000..ca70013
--- /dev/null
+++ b/tests/bz_2219504-check.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+OUTPUT=`rpm -qR perl-Date-Manip`
+
+if ! echo "$OUTPUT" | grep -q "MODULE_COMPAT_"; then
+    exit 0
+else
+    exit 1
+fi
diff --git a/tests/bz_2219504.fmf b/tests/bz_2219504.fmf
new file mode 100644
index 0000000..f8a9f39
--- /dev/null
+++ b/tests/bz_2219504.fmf
@@ -0,0 +1,15 @@
+summary: Test for BZ 2219504
+component:
+  - perl-Date-Manip
+require:
+  - bash
+  - perl-Date-Manip
+test: ./bz_2219504-check.sh
+enabled: false
+adjust:
+  - when: distro == centos-stream-8 or distro == rhel-8
+    enabled: true
+tag:
+  - TestCaseCopy
+  - Tier1
+tier: '1'
diff --git a/tests/upstream-tests.fmf b/tests/upstream-tests.fmf
new file mode 100644
index 0000000..88ee7b0
--- /dev/null
+++ b/tests/upstream-tests.fmf
@@ -0,0 +1,8 @@
+summary: Upstream tests
+component: perl-Date-Manip
+require: perl-Date-Manip-tests
+test: /usr/libexec/perl-Date-Manip/test
+tag:
+  - TestCaseCopy
+  - Tier1
+tier: '1'