michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix to drop --requires flag as suppressed by module's rpm_requires flag

Browse Source
This commit is contained in:
Ilia Ross
2025-05-30 16:44:38 +03:00
parent b04f0a5160
commit 784435d3ca
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
makemodulerpm.pl
View File

@@ -34,7 +34,7 @@ my $allow_overwrite = 0;
my ($force_theme, $rpmdepends, $rpmrecommends, $no_prefix, $set_prefix, $vendor,
$url, $force_usermin, $final_mod, $sign, $keyname,
$epoch, $dir, $ver, @extrareqs, @exclude);
$epoch, $dir, $ver, @exclude);
# Parse command-line args
while(@ARGV) {
@@ -82,9 +82,6 @@ while(@ARGV) {
elsif ($a eq "--dir") {
$final_mod = &untaint(shift(@ARGV));
}
elsif ($a eq "--requires") {
push(@extrareqs, shift(@ARGV));
}
elsif ($a eq "--allow-overwrite") {
$allow_overwrite = 1;
}
@@ -280,7 +277,7 @@ if ($rpmdepends && defined($minfo{'depends'})) {
$dver ? ($prefix.$dmod, ">=", $dver) :
($prefix.$dmod));
}
$rdeps = join(" ", @rdeps, @extrareqs);
$rdeps = join(" ", @rdeps);
}
# Build list of recommended packages on other RPMs, for inclusion as an RPM