The package rpms/perl-MaxMind-DB-Reader.git has added or updated architecture specific
content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/perl-MaxMind-DB-Reader.git/commit....
Change:
-%ifnarch %{ix86} %{arm}
Thanks.
Full change:
============
commit d04044cebacf5b5f83c2e12725de69347a19de58
Author: Petr Písař <ppisar(a)redhat.com>
Date: Fri Jul 29 12:48:18 2022 +0200
Migrate a License tag to an SPDX format
diff --git a/perl-MaxMind-DB-Reader.spec b/perl-MaxMind-DB-Reader.spec
index 5168c6e..d751618 100644
--- a/perl-MaxMind-DB-Reader.spec
+++ b/perl-MaxMind-DB-Reader.spec
@@ -16,13 +16,13 @@ Name: perl-MaxMind-DB-Reader
Version: 1.000014
Release: 6%{?dist}
Summary: Read MaxMind database files and look up IP addresses
-# lib/MaxMind/DB/Reader.pm: Artistic 2.0
-# LICENSE: Artistic 2.0 text
-# Makefile.PL: Artistic 2.0
-# maxmind-db/LICENSE: CC-BY-SA
+# lib/MaxMind/DB/Reader.pm: Artistic-2.0
+# LICENSE: Artistic-2.0 text
+# Makefile.PL: Artistic-2.0
+# maxmind-db/LICENSE: CC-BY-SA-3.0
## Not in any binary package
-# maxmind-db/MaxMind-DB-spec.md: CC-BY-SA
-License: Artistic 2.0
+# maxmind-db/MaxMind-DB-spec.md: CC-BY-SA-3.0
+License: Artistic-2.0
URL:
https://metacpan.org/release/MaxMind-DB-Reader
Source0:
https://cpan.metacpan.org/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-%{ver...
# Do not use /bin/env in the shebangs
@@ -99,7 +99,7 @@ This module provides a low-level interface to the MaxMind database file
format
%package tests
Summary: Tests for %{name}
-License: Artistic 2.0 and CC-BY-SA
+License: Artistic-2.0 AND CC-BY-SA-3.0
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: perl-Test-Harness
%if %{enable_int128}
@@ -162,6 +162,7 @@ make test
%changelog
* Fri Jul 29 2022 Petr Pisar <ppisar(a)redhat.com> - 1.000014-6
- Make fullarch to correctly choose test dependencies varying by architecture
+- Migrate a License tag to an SPDX format
* Thu Apr 21 2022 Petr Pisar <ppisar(a)redhat.com> - 1.000014-5
- Package the tests
commit 0cd0bb970524ebc2cc7f5663c06172080b7e0c22
Author: Petr Písař <ppisar(a)redhat.com>
Date: Fri Jul 29 12:31:23 2022 +0200
Make fullarch to correctly choose test dependencies varying by architecture
diff --git a/perl-MaxMind-DB-Reader.rpmlintrc b/perl-MaxMind-DB-Reader.rpmlintrc
index a5d5f5e..3d78ab6 100644
--- a/perl-MaxMind-DB-Reader.rpmlintrc
+++ b/perl-MaxMind-DB-Reader.rpmlintrc
@@ -1 +1,3 @@
-addFilter('-tests\.noarch: W: no-documentation')
+addFilter('-tests\..*: W: no-documentation')
+# Fullarch because of arch-specific dependencies
+addFilter('E: no-binary')
diff --git a/perl-MaxMind-DB-Reader.spec b/perl-MaxMind-DB-Reader.spec
index 77d7ff2..5168c6e 100644
--- a/perl-MaxMind-DB-Reader.spec
+++ b/perl-MaxMind-DB-Reader.spec
@@ -9,9 +9,12 @@
%endif
%endif
+# No ELF executables packaged.
+%global debug_package %{nil}
+
Name: perl-MaxMind-DB-Reader
Version: 1.000014
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Read MaxMind database files and look up IP addresses
# lib/MaxMind/DB/Reader.pm: Artistic 2.0
# LICENSE: Artistic 2.0 text
@@ -24,7 +27,9 @@ URL:
https://metacpan.org/release/MaxMind-DB-Reader
Source0:
https://cpan.metacpan.org/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-%{ver...
# Do not use /bin/env in the shebangs
Patch0: MaxMind-DB-Reader-1.000014-Normalize-shebangs.patch
-BuildArch: noarch
+# Keep fullarch. ifnarch condition does not work on noarch because it consults
+# a target architecture.
+#BuildArch: noarch
BuildRequires: coreutils
BuildRequires: make
BuildRequires: perl-generators
@@ -155,6 +160,9 @@ make test
%{_libexecdir}/%{name}
%changelog
+* Fri Jul 29 2022 Petr Pisar <ppisar(a)redhat.com> - 1.000014-6
+- Make fullarch to correctly choose test dependencies varying by architecture
+
* Thu Apr 21 2022 Petr Pisar <ppisar(a)redhat.com> - 1.000014-5
- Package the tests
commit 1154e5a3cf56ebf054fd013aea820df34b5859f1
Author: Petr Písař <ppisar(a)redhat.com>
Date: Thu Apr 21 15:44:40 2022 +0200
Add TMT tests and gating
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..282e16b
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,7 @@
+--- !Policy
+product_versions:
+ - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+ - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
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/upstream-tests.fmf b/tests/upstream-tests.fmf
new file mode 100644
index 0000000..8aa614c
--- /dev/null
+++ b/tests/upstream-tests.fmf
@@ -0,0 +1,4 @@
+summary: Upstream tests
+component: perl-MaxMind-DB-Reader
+require: perl-MaxMind-DB-Reader-tests
+test: /usr/libexec/perl-MaxMind-DB-Reader/test
commit 90ddd5917619a2887eb268adbfbdd9dac433b031
Author: Petr Písař <ppisar(a)redhat.com>
Date: Thu Apr 21 15:42:32 2022 +0200
Package the tests
diff --git a/perl-MaxMind-DB-Reader.rpmlintrc b/perl-MaxMind-DB-Reader.rpmlintrc
new file mode 100644
index 0000000..a5d5f5e
--- /dev/null
+++ b/perl-MaxMind-DB-Reader.rpmlintrc
@@ -0,0 +1 @@
+addFilter('-tests\.noarch: W: no-documentation')
diff --git a/perl-MaxMind-DB-Reader.spec b/perl-MaxMind-DB-Reader.spec
index fa560df..77d7ff2 100644
--- a/perl-MaxMind-DB-Reader.spec
+++ b/perl-MaxMind-DB-Reader.spec
@@ -1,15 +1,23 @@
# Perform optional tests
%bcond_without perl_MaxMind_DB_Reader_enables_optional_test
+# Math::Int128 is not available on 32-bit platforms
+%define enable_int128 0
+%if %{with perl_MaxMind_DB_Reader_enables_optional_test}
+%ifnarch %{ix86} %{arm}
+%define enable_int128 1
+%endif
+%endif
+
Name: perl-MaxMind-DB-Reader
Version: 1.000014
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Read MaxMind database files and look up IP addresses
# lib/MaxMind/DB/Reader.pm: Artistic 2.0
# LICENSE: Artistic 2.0 text
# Makefile.PL: Artistic 2.0
-## Not in any binary package
# maxmind-db/LICENSE: CC-BY-SA
+## Not in any binary package
# maxmind-db/MaxMind-DB-spec.md: CC-BY-SA
License: Artistic 2.0
URL:
https://metacpan.org/release/MaxMind-DB-Reader
@@ -22,6 +30,7 @@ BuildRequires: make
BuildRequires: perl-generators
BuildRequires: perl-interpreter
BuildRequires: perl(:VERSION) >= 5.10
+BuildRequires: perl(Config)
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76
BuildRequires: perl(strict)
BuildRequires: perl(warnings)
@@ -64,26 +73,53 @@ BuildRequires: perl(Test::More) >= 0.96
BuildRequires: perl(Test::Number::Delta)
BuildRequires: perl(Test::Requires)
BuildRequires: perl(utf8)
-%if %{with perl_MaxMind_DB_Reader_enables_optional_test}
+%if %{enable_int128}
# Optional tests:
-# Math::Int128 is not available on 32-bit platforms
-%ifnarch %{ix86} %{arm}
BuildRequires: perl(Math::Int128)
BuildRequires: perl(Net::Works::Network) >= 0.21
%endif
-%endif
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo
$version))
Recommends: perl(DateTime)
Suggests: perl(MaxMind::DB::Reader::XS) >= 1.000003
+# Filter under-specified dependencies
+%global __requires_exclude
%{?__requires_exclude:%{__requires_exclude}|}^perl\\(Test::More\\)$
+# Filter private modules
+%global __requires_exclude %{__requires_exclude}|^perl\\(Test::MaxMind::DB::Reader
+%global __provides_exclude
%{?__provides_exclude:%{__provides_exclude}|}^perl\\(Test::MaxMind::DB::Reader
+
%description
This module provides a low-level interface to the MaxMind database file format
<
http://maxmind.github.io/MaxMind-DB/>.
+%package tests
+Summary: Tests for %{name}
+License: Artistic 2.0 and CC-BY-SA
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: perl-Test-Harness
+%if %{enable_int128}
+# Math::Int128 autodetected
+Requires: perl(Net::Works::Network) >= 0.21
+%endif
+Requires: perl(Test::More) >= 0.96
+
+%description tests
+Tests from %{name}. Execute them
+with "%{_libexecdir}/%{name}/test".
+
%prep
%setup -q -n MaxMind-DB-Reader-%{version}
%patch0 -p1
chmod -x eg/*
+# Help generators to recognize Perl scripts
+for F in $(find t -name '*.t'); do
+ perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 &&
!s{\A#!\s*perl}{$Config{startperl}}' "$F"
+ chmod +x "$F"
+done
+%if !%{enable_int128}
+rm t/MaxMind/DB/Reader-decoder.t
+perl -i -ne 'print $_ unless m{\A\Qt/MaxMind/DB/Reader-decoder.t\E}' MANIFEST
+%endif
%build
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
@@ -91,9 +127,20 @@ perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
%install
%{make_install}
-%{_fixperms} $RPM_BUILD_ROOT/*
+%{_fixperms} %{buildroot}/*
+# Install tests
+mkdir -p %{buildroot}%{_libexecdir}/%{name}/maxmind-db
+cp -a t %{buildroot}%{_libexecdir}/%{name}
+cp -a maxmind-db/test-data %{buildroot}%{_libexecdir}/%{name}/maxmind-db
+rm %{buildroot}%{_libexecdir}/%{name}/maxmind-db/test-data/write-test-data.pl
+cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
+#!/bin/sh
+cd %{_libexecdir}/%{name} && exec prove -I . -j "$(getconf
_NPROCESSORS_ONLN)" -r
+EOF
+chmod +x %{buildroot}%{_libexecdir}/%{name}/test
%check
+export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print $1}
else {print 1}' -- '%{?_smp_mflags}')
make test
%files
@@ -103,7 +150,14 @@ make test
%{perl_vendorlib}/*
%{_mandir}/man3/*
+%files tests
+%license maxmind-db/LICENSE
+%{_libexecdir}/%{name}
+
%changelog
+* Thu Apr 21 2022 Petr Pisar <ppisar(a)redhat.com> - 1.000014-5
+- Package the tests
+
* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.000014-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild