From b1e2ae6be7aac451dc8327752c8ad13d3895d3a7 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 11 Mar 2021 20:07:50 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/perl-Locale-Codes.git#d7b9e23f017cffafcdc923385a562416c08c4f93 --- .fmf/version | 1 + .gitignore | 1 + gating.yaml | 7 +++++++ perl-Locale-Codes.rpmlintrc | 2 ++ perl-Locale-Codes.spec | 24 +++++++++++++++--------- plans/sanity.fmf | 5 +++++ sources | 2 +- tests/upstream-tests.fmf | 4 ++++ 8 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 .fmf/version create mode 100644 gating.yaml create mode 100644 perl-Locale-Codes.rpmlintrc create mode 100644 plans/sanity.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/.gitignore b/.gitignore index 240bf44..d10fb1d 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /Locale-Codes-3.64.tar.gz /Locale-Codes-3.65.tar.gz /Locale-Codes-3.66.tar.gz +/Locale-Codes-3.67.tar.gz 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/perl-Locale-Codes.rpmlintrc b/perl-Locale-Codes.rpmlintrc new file mode 100644 index 0000000..8c61ed4 --- /dev/null +++ b/perl-Locale-Codes.rpmlintrc @@ -0,0 +1,2 @@ +from Config import * +addFilter("-tests\.noarch: W: no-documentation"); diff --git a/perl-Locale-Codes.spec b/perl-Locale-Codes.spec index a308261..78ccd5f 100644 --- a/perl-Locale-Codes.spec +++ b/perl-Locale-Codes.spec @@ -1,6 +1,6 @@ Name: perl-Locale-Codes -Version: 3.66 -Release: 2%{?dist} +Version: 3.67 +Release: 1%{?dist} Summary: Distribution of modules to handle locale codes License: GPL+ or Artistic URL: https://metacpan.org/release/Locale-Codes @@ -32,6 +32,8 @@ Requires: perl(deprecate) %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Locale::Codes::Country_Retired\\)|^perl\\(Locale::Codes::LangFam_Retired\\)|^perl\\(Locale::Codes::Script_Retired\\)|^perl\\(Locale::Codes::LangExt_Codes\\)|^perl\\(Locale::Codes::LangFam_Codes\\)|^perl\\(Locale::Codes::Script_Codes\\)|^perl\\(Locale::Codes::Language_Codes\\)|^perl\\(Locale::Codes::LangExt_Retired\\)|^perl\\(Locale::Codes::Currency_Codes\\)|^perl\\(Locale::Codes::LangVar_Retired\\)|^perl\\(Locale::Codes::Language_Retired\\)|^perl\\(Locale::Codes::Country_Codes\\)|^perl\\(Locale::Codes::LangVar_Codes\\)|^perl\\(Locale::Codes::Currency_Retired\\) # Filter dependencies on test subscripts %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(do_tests\\.pl\\) +# Filter underspecified dependencies +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Test::Inter\\)$ %description Locale-Codes is a distribution containing a set of modules. The modules @@ -42,9 +44,10 @@ including languages, countries, currency, etc. Summary: Tests for %{name} Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: perl-Test-Harness +Requires: perl(Test::Inter) >= 1.09 %description tests -Tests from %{name}-%{version}. Execute them +Tests from %{name}. Execute them with "%{_libexecdir}/%{name}/test". %prep @@ -64,17 +67,17 @@ perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 %install %{make_install} -mkdir -p %{buildroot}/%{_libexecdir}/%{name} -cp -a t %{buildroot}/%{_libexecdir}/%{name} -cat > %{buildroot}/%{_libexecdir}/%{name}/test << 'EOF' +%{_fixperms} %{buildroot}/* +mkdir -p %{buildroot}%{_libexecdir}/%{name} +cp -a t %{buildroot}%{_libexecdir}/%{name} +cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF' #!/usr/bin/sh cd %{_libexecdir}/%{name} && exec prove -j $(getconf _NPROCESSORS_ONLN) EOF -chmod +x %{buildroot}/%{_libexecdir}/%{name}/test -%{_fixperms} %{buildroot}/* +chmod +x %{buildroot}%{_libexecdir}/%{name}/test %check -unset RELEASE_TESTING +export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print $1} else {print 1}' -- '%{?_smp_mflags}') make test %files @@ -87,6 +90,9 @@ make test %{_libexecdir}/%{name} %changelog +* Tue Mar 02 2021 Petr Pisar - 3.67-1 +- 3.67 bump + * Wed Jan 27 2021 Fedora Release Engineering - 3.66-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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/sources b/sources index bad2ccf..bbfb9b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Locale-Codes-3.66.tar.gz) = e0096c2f167ca81761a40e9728ad11f1ae3b0854e48744610ed8a69f1d5baa40b553994382ea4db05724113ee5c2f507feaf303c0fd29daeb006a0383c35d825 +SHA512 (Locale-Codes-3.67.tar.gz) = aa477c07f5e673c6810e8ba33ba699691525c48d2e5311a93c0222a4ee58afc52d23597450101f822c077d3fb6b762df2bb2276aed76f8391ad9ce38f329a7f8 diff --git a/tests/upstream-tests.fmf b/tests/upstream-tests.fmf new file mode 100644 index 0000000..c8170df --- /dev/null +++ b/tests/upstream-tests.fmf @@ -0,0 +1,4 @@ +summary: Upstream tests +component: perl-Locale-Codes +require: perl-Locale-Codes-tests +test: /usr/libexec/perl-Locale-Codes/test