mirror of
https://github.com/webmin/webmin.git
synced 2026-02-03 14:13:29 +00:00
Fix to try Conflicts: as well
This commit is contained in:
12
makerpm.pl
12
makerpm.pl
@@ -82,13 +82,19 @@ else {
|
||||
$tarfile = "webmin$product_suff-$ver.tar.gz";
|
||||
}
|
||||
$rpmspec_obsoletes = "\nObsoletes: webmin-essential <= \%\{version\}-\%\{release\}\n";
|
||||
$rpmspec_obsoletes .= "\nObsoletes: webmin-minimal <= \%\{version\}-\%\{release\}\n";
|
||||
$rpmspec_obsoletes .= "Obsoletes: webmin-minimal <= \%\{version\}-\%\{release\}\n";
|
||||
$rpmspec_obsoletes .= "Conflicts: webmin-essential <= \%\{version\}-\%\{release\}\n";
|
||||
$rpmspec_obsoletes .= "Conflicts: webmin-minimal <= \%\{version\}-\%\{release\}\n";
|
||||
if ($product_suff) {
|
||||
$rpmspec_obsoletes = "\nObsoletes: webmin <= \%\{version\}-\%\{release\}\n",
|
||||
$rpmspec_obsoletes .= "\nObsoletes: webmin-minimal <= \%\{version\}-\%\{release\}\n"
|
||||
$rpmspec_obsoletes .= "Obsoletes: webmin-minimal <= \%\{version\}-\%\{release\}\n",
|
||||
$rpmspec_obsoletes .= "Conflicts: webmin <= \%\{version\}-\%\{release\}\n",
|
||||
$rpmspec_obsoletes .= "Conflicts: webmin-minimal <= \%\{version\}-\%\{release\}\n"
|
||||
if ($product_type eq 'essential');
|
||||
$rpmspec_obsoletes = "\nObsoletes: webmin <= \%\{version\}-\%\{release\}\n",
|
||||
$rpmspec_obsoletes .= "\nObsoletes: webmin-essential <= \%\{version\}-\%\{release\}\n"
|
||||
$rpmspec_obsoletes .= "Obsoletes: webmin-essential <= \%\{version\}-\%\{release\}\n",
|
||||
$rpmspec_obsoletes .= "Conflicts: webmin <= \%\{version\}-\%\{release\}\n",
|
||||
$rpmspec_obsoletes .= "Conflicts: webmin-essential <= \%\{version\}-\%\{release\}\n"
|
||||
if ($product_type eq 'minimal');
|
||||
}
|
||||
system("cp tarballs/$tarfile $source_dir");
|
||||
|
||||
Reference in New Issue
Block a user