From 937e1cd154998b144051a67fa7a98d8df83249ab Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Fri, 5 Sep 2025 22:55:45 +0800 Subject: [PATCH] correctly dump content of META.yml files --- perl-generators.spec | 5 ++++- perlmeta_buildrequires | 50 +++++++++++++++++++++++------------------- 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/perl-generators.spec b/perl-generators.spec index 8821f7f..22db179 100644 --- a/perl-generators.spec +++ b/perl-generators.spec @@ -1,6 +1,6 @@ Name: perl-generators Version: 1.16 -Release: 5 +Release: 6 Summary: RPM Perl dependencies generators License: GPL-1.0-or-later and GPL-2.0-or-later URL: http://jplesnik.fedorapeople.org/generators @@ -82,6 +82,9 @@ make test %{_rpmmacrodir}/macros.perl-meta %changelog +* Fri Sep 05 2025 Funda Wang - 1.16-6 +- correctly dump content of META.yml files + * Fri Aug 29 2025 Funda Wang - 1.16-5 - dump build requires also diff --git a/perlmeta_buildrequires b/perlmeta_buildrequires index c30fac4..f42d9ec 100755 --- a/perlmeta_buildrequires +++ b/perlmeta_buildrequires @@ -45,31 +45,35 @@ foreach $module ( sort keys %$requires ) { } } -if ($meta->{"meta-spec"}{version} >= 2) { - # dump the build requires with their version - $requires = $meta->{prereqs}{build}{requires}; - foreach $module ( sort keys %$requires ) { - next if $module eq 'perl'; # minimum perl version - my $version = $requires->{$module}; - if ( $version == 0 ) { - print "perl($module)\n"; - } else { - print "perl($module) >= $version\n"; - } - } +# dump the build requires with their version +$requires = $meta->{"meta-spec"}{version} >= 2 + ? $meta->{prereqs}{build}{requires} + : $meta->{build_requires}; +foreach $module ( sort keys %$requires ) { + next if $module eq 'perl'; # minimum perl version + my $version = $requires->{$module}; + if ( $version == 0 ) { + print "perl($module)\n"; + } else { + print "perl($module) >= $version\n"; + } +} - # dump the configure requires with their version - $requires = $meta->{prereqs}{configure}{requires}; - foreach $module ( sort keys %$requires ) { - next if $module eq 'perl'; # minimum perl version - my $version = $requires->{$module}; - if ( $version == 0 ) { - print "perl($module)\n"; - } else { - print "perl($module) >= $version\n"; - } - } +# dump the configure requires with their version +$requires = $meta->{"meta-spec"}{version} >= 2 + ? $meta->{prereqs}{configure}{requires} + : $meta->{configure_requires}; +foreach $module ( sort keys %$requires ) { + next if $module eq 'perl'; # minimum perl version + my $version = $requires->{$module}; + if ( $version == 0 ) { + print "perl($module)\n"; + } else { + print "perl($module) >= $version\n"; + } +} +if ($meta->{"meta-spec"}{version} >= 2) { my $process_test = 1; GetOptions ('test!' => \$process_test); if($process_test) { -- Gitee