diff --git a/.gitignore b/.gitignore index 5abdc1f..06935ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/generators-1.11.tar.gz +generators-1.16.tar.gz diff --git a/.perl-generators.metadata b/.perl-generators.metadata deleted file mode 100644 index a81e424..0000000 --- a/.perl-generators.metadata +++ /dev/null @@ -1 +0,0 @@ -2f19f15e53de68012639cf852d0150138f52bf25 SOURCES/generators-1.11.tar.gz diff --git a/SPECS/perl-generators.spec b/perl-generators.spec similarity index 52% rename from SPECS/perl-generators.spec rename to perl-generators.spec index a482e4d..b9c2245 100644 --- a/SPECS/perl-generators.spec +++ b/perl-generators.spec @@ -1,27 +1,35 @@ Name: perl-generators -Version: 1.11 -Release: 4%{?dist} +Version: 1.16 +Release: 7%{?dist} Summary: RPM Perl dependencies generators -License: GPL+ +License: GPL-1.0-or-later URL: http://jplesnik.fedorapeople.org/generators Source0: %{url}/generators-%{version}.tar.gz BuildArch: noarch BuildRequires: coreutils BuildRequires: make -BuildRequires: perl-interpreter >= 4:5.22.0-351 %if !%{defined perl_bootstrap} # Break build cycle: reflexive dependency BuildRequires: perl-generators %endif +BuildRequires: perl-interpreter >= 4:5.22.0-351 +BuildRequires: perl(Config) BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 -BuildRequires: perl(Fedora::VSP) BuildRequires: perl(File::Copy) BuildRequires: perl(File::Find) BuildRequires: perl(strict) -BuildRequires: perl(Test::More) BuildRequires: perl(warnings) BuildRequires: sed -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) +# Run-time: +BuildRequires: perl(Fedora::VSP) +BuildRequires: perl(File::Basename) +# Optional run-time: +# version not used at tests +# Tests: +BuildRequires: perl(lib) +BuildRequires: perl(Exporter) +BuildRequires: perl(Test::More) +BuildRequires: perl(Test::Simple) Requires: perl-interpreter >= 4:5.22.0-351 # Per Perl packaging guidelines, build-requiring perl-generators should # deliver Perl macros @@ -29,39 +37,156 @@ Requires: perl-macros %if %{defined perl_bootstrap} # Supply run-time dependencies manually when perl-generators is not available Requires: perl(Fedora::VSP) +Requires: perl(File::Basename) %endif +Recommends: perl(version) # The generators and attribute files were split from rpm-build Conflicts: rpm-build < 4.11.2-15 +# Filter modules bundled for tests +%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir} +%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(PerlNS\\) + %description This package provides RPM Perl dependencies generators which are used for getting provides and requires from Perl binaries and modules. +%package tests +Summary: Tests for %{name} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: perl-Test-Harness +%if %{defined perl_bootstrap} +# Supply run-time dependencies manually when perl-generators is not available +Requires: perl(Exporter) +Requires: perl(lib) +Requires: perl(strict) +Requires: perl(Test::More) +Requires: perl(Test::Simple) +Requires: perl(warnings) +%endif + +%description tests +Tests from %{name}. Execute them +with "%{_libexecdir}/%{name}/test". + %prep %setup -q -n generators-%{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 INSTALLVENDORSCRIPT=%{_rpmconfigdir} \ - NO_PACKLIST=1 -make %{?_smp_mflags} + NO_PACKLIST=1 NO_PERLLOCAL=1 +%{make_build} %install -make pure_install DESTDIR=%{buildroot} -%{_fixperms} $RPM_BUILD_ROOT/* +%{make_install} +%{_fixperms} %{buildroot}/* mkdir -p %{buildroot}%{_rpmconfigdir}/fileattrs/ install -p -m 644 fileattrs/* '%{buildroot}%{_rpmconfigdir}/fileattrs' +# Install tests +mkdir -p %{buildroot}%{_libexecdir}/%{name} +cp -a t %{buildroot}%{_libexecdir}/%{name} +perl -i -pe "s{bin/perl}{%{_rpmconfigdir}/perl}" %{buildroot}%{_libexecdir}/%{name}/t/lib/PerlNS.pm +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 %files %doc Changes TODO -%{_rpmconfigdir}/perl.* +%{_rpmconfigdir}/perl* %{_rpmconfigdir}/fileattrs/perl*.attr +%files tests +%{_libexecdir}/%{name} + %changelog +* Tue Oct 29 2024 Troy Dawson - 1.16-7 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 1.16-6 +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 1.16-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.16-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 1.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 1.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jan 05 2023 Jitka Plesnikova - 1.16-1 +- 1.16 bump + +* Tue Dec 06 2022 Jitka Plesnikova - 1.15-1 +- 1.15 bump +- Package tests + +* Tue Aug 16 2022 Jitka Plesnikova - 1.14-1 +- 1.14 bump + +* Fri Jul 22 2022 Fedora Release Engineering - 1.13-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jun 03 2022 Jitka Plesnikova - 1.13-7 +- Perl 5.36 re-rebuild of bootstrapped packages + +* Mon May 30 2022 Jitka Plesnikova - 1.13-6 +- Perl 5.36 rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 1.13-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 24 2021 Jitka Plesnikova - 1.13-3 +- Perl 5.34 re-rebuild of bootstrapped packages + +* Fri May 21 2021 Jitka Plesnikova - 1.13-2 +- Perl 5.34 rebuild + +* Mon May 10 2021 Jitka Plesnikova - 1.13-1 +- 1.13 bump + +* Wed Feb 10 2021 Jitka Plesnikova - 1.12-1 +- 1.12 bump + Add perltest.attr to generate dependencies from /usr/libexec/ + +* Wed Jan 27 2021 Fedora Release Engineering - 1.11-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Jul 30 2020 Petr Pisar - 1.11-9 +- Specify all dependencies + +* Tue Jul 28 2020 Fedora Release Engineering - 1.11-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jun 26 2020 Jitka Plesnikova - 1.11-7 +- Perl 5.32 re-rebuild of bootstrapped packages + +* Mon Jun 22 2020 Jitka Plesnikova - 1.11-6 +- Perl 5.32 rebuild + +* Thu Jan 30 2020 Fedora Release Engineering - 1.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 1.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources new file mode 100644 index 0000000..eca9333 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (generators-1.16.tar.gz) = 5ddc0a4da0b81792b2a292c517dfbcd47aa5241c74f9eacacd884c8292fa86e788af95ecece04ed87d8e3925bbec3fb0ffff5bf6a09b2089b4b330e54cfaf89a