From b9c154911a42c1c341c2b345cb658914dc1c2b94 Mon Sep 17 00:00:00 2001 From: iliajie Date: Sun, 21 May 2023 23:09:42 +0300 Subject: [PATCH] Fix to finally use `Conflicts:` --- makerpm.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/makerpm.pl b/makerpm.pl index 05d067185..c8b8a495f 100755 --- a/makerpm.pl +++ b/makerpm.pl @@ -81,14 +81,14 @@ if ($rel > 1 && -r "tarballs/webmin$product_suff-$ver-$rel.tar.gz") { else { $tarfile = "webmin$product_suff-$ver.tar.gz"; } -$rpmspec_obsoletes = "\n\nObsoletes: webmin-essential < \%\{version\}-\%\{release\}\n"; -$rpmspec_obsoletes .= "Obsoletes: webmin-minimal < \%\{version\}-\%\{release\}\n"; +$rpmspec_obsoletes = "\nConflicts: webmin-essential <= \%\{version\}-\%\{release\}\n"; +$rpmspec_obsoletes .= "Conflicts: webmin-minimal <= \%\{version\}-\%\{release\}\n"; if ($product_suff) { - $rpmspec_obsoletes = "\n\nObsoletes: webmin < \%\{version\}-\%\{release\}\n", - $rpmspec_obsoletes .= "Obsoletes: webmin-minimal < \%\{version\}-\%\{release\}\n" + $rpmspec_obsoletes = "\nConflicts: webmin <= \%\{version\}-\%\{release\}\n", + $rpmspec_obsoletes .= "Conflicts: webmin-minimal <= \%\{version\}-\%\{release\}\n" if ($product_type eq 'essential'); - $rpmspec_obsoletes = "\n\nObsoletes: webmin < \%\{version\}-\%\{release\}\n", - $rpmspec_obsoletes .= "Obsoletes: webmin-essential < \%\{version\}-\%\{release\}\n" + $rpmspec_obsoletes = "\nConflicts: webmin <= \%\{version\}-\%\{release\}\n", + $rpmspec_obsoletes .= "Conflicts: webmin-essential <= \%\{version\}-\%\{release\}\n" if ($product_type eq 'minimal'); } system("cp tarballs/$tarfile $source_dir");