From 2ca8193df5c7b3cfcb42a9480116a356cfe27f62 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Mon, 17 Nov 2025 10:25:39 +0800 Subject: [PATCH] force stdin of analysor script --- macros.perl-meta | 4 +++- perl-generators.spec | 5 ++++- perlmeta_analysor | 18 ++++++++++-------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/macros.perl-meta b/macros.perl-meta index 2e2122f..f6d220f 100644 --- a/macros.perl-meta +++ b/macros.perl-meta @@ -6,4 +6,6 @@ %__perlmeta_buildrequires %{_rpmconfigdir}/@VENDOR@/perlmeta_analysor -%perlmeta_buildrequires(x) %__perlmeta_buildrequires --buildrequires %{!-x:--test} +%perlmeta_buildrequires(x) \ +( [ -f ./META.json ] && echo './META.json' | %__perlmeta_buildrequires --buildrequires %{!-x:--test} ) || \ +( [ -f ./META.yml ] && echo './META.yml' | %__perlmeta_buildrequires --buildrequires %{!-x:--test} ) diff --git a/perl-generators.spec b/perl-generators.spec index 7957e85..625bc33 100644 --- a/perl-generators.spec +++ b/perl-generators.spec @@ -1,6 +1,6 @@ Name: perl-generators Version: 1.16 -Release: 7 +Release: 8 Summary: RPM Perl dependencies generators License: GPL-1.0-or-later and GPL-2.0-or-later URL: http://jplesnik.fedorapeople.org/generators @@ -78,6 +78,9 @@ make test %{_rpmmacrodir}/macros.perl-meta %changelog +* Fri Nov 14 2025 Funda Wang - 1.16-8 +- force stdin of analysor script + * Fri Nov 14 2025 Funda Wang - 1.16-7 - merge two META.json/yml analysors for runtime and buildtime into one diff --git a/perlmeta_analysor b/perlmeta_analysor index 926bcd5..9489a50 100755 --- a/perlmeta_analysor +++ b/perlmeta_analysor @@ -22,11 +22,19 @@ use JSON qw{ from_json }; use YAML qw{ Load }; use Getopt::Long; +my $process_requires = 0; +my $process_buildrequires = 0; +my $process_test = 0; +my $process_recommends = 0; + +GetOptions ('requires!' => \$process_requires, 'buildrequires!' => \$process_buildrequires, 'recommends!' => \$process_recommends, 'test!' => \$process_test); + # slurp the file -my $path = './META.json'; +my $path = <>; +chomp($path); + my $fh; open $fh, '<', $path - or (open $fh, '<', './META.yml' and $path = './META.yml') or die "can't open $path: $!"; my $data = do { local $/; <$fh> }; close $fh; @@ -39,12 +47,6 @@ my $meta = $path =~ /\.yml$/ my $module; my $requires; -my $process_requires = 0; -my $process_buildrequires = 0; -my $process_test = 0; -my $process_recommends = 0; - -GetOptions ('requires!' => \$process_requires, 'buildrequires!' => \$process_buildrequires, 'recommends!' => \$process_recommends, 'test!' => \$process_test); if ($process_requires) { # dump the runtime requires with their version $requires = $meta->{"meta-spec"}{version} >= 2 -- Gitee