From 69d359c4fef1e9e001bc8515d6ab721bf43090bf Mon Sep 17 00:00:00 2001 From: iliajie Date: Sun, 21 May 2023 21:59:39 +0300 Subject: [PATCH] Fix `Obsoletes:` to include `%{version}-%{release}` number --- makerpm.pl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/makerpm.pl b/makerpm.pl index ad0024fe4..c9f85b0a9 100755 --- a/makerpm.pl +++ b/makerpm.pl @@ -81,11 +81,14 @@ if ($rel > 1 && -r "tarballs/webmin$product_suff-$ver-$rel.tar.gz") { else { $tarfile = "webmin$product_suff-$ver.tar.gz"; } -$rpmspec_obsoletes = "\nObsoletes: webmin-essential webmin-minimal\n"; +$rpmspec_obsoletes = "\nObsoletes: webmin-essential <= \%\{version\}-\%\{release\}\n"; +$rpmspec_obsoletes .= "\nObsoletes: webmin-minimal <= \%\{version\}-\%\{release\}\n"; if ($product_suff) { - $rpmspec_obsoletes = "\nObsoletes: webmin webmin-minimal\n" + $rpmspec_obsoletes = "\nObsoletes: webmin <= \%\{version\}-\%\{release\}\n", + $rpmspec_obsoletes .= "\nObsoletes: webmin-minimal <= \%\{version\}-\%\{release\}\n" if ($product_type eq 'essential'); - $rpmspec_obsoletes = "\nObsoletes: webmin webmin-essential\n" + $rpmspec_obsoletes = "\nObsoletes: webmin <= \%\{version\}-\%\{release\}\n", + $rpmspec_obsoletes .= "\nObsoletes: webmin-essential <= \%\{version\}-\%\{release\}\n" if ($product_type eq 'minimal'); } system("cp tarballs/$tarfile $source_dir");