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 not to use Conflicts: ; Provide %{name}-%{version} only

Browse Source
This commit is contained in:
iliajie
2023-05-21 22:36:06 +03:00
parent 9ecfb06187
commit e504bd7e8e
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
makerpm.pl
View File

@@ -81,21 +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 <= \%\{version\}-\%\{release\}\n";
$rpmspec_obsoletes .= "Conflicts: webmin-essential <= \%\{version\}-\%\{release\}\n";
$rpmspec_obsoletes .= "\nObsoletes: webmin-minimal <= \%\{version\}-\%\{release\}\n";
$rpmspec_obsoletes .= "Conflicts: webmin-minimal <= \%\{version\}-\%\{release\}\n";
$rpmspec_obsoletes = "\n\nObsoletes: webmin-essential < \%\{version\}-\%\{release\}\n";
$rpmspec_obsoletes .= "Obsoletes: webmin-minimal < \%\{version\}-\%\{release\}\n";
if ($product_suff) {
$provides_type = " \%\{name\}$product_suff-\%\{version\}";
$rpmspec_obsoletes = "\nObsoletes: webmin <= \%\{version\}-\%\{release\}\n",
$rpmspec_obsoletes .= "Conflicts: webmin <= \%\{version\}-\%\{release\}\n",
$rpmspec_obsoletes .= "\nObsoletes: webmin-minimal <= \%\{version\}-\%\{release\}\n",
$rpmspec_obsoletes .= "Conflicts: webmin-minimal <= \%\{version\}-\%\{release\}\n"
$rpmspec_obsoletes = "\n\nObsoletes: webmin < \%\{version\}-\%\{release\}\n",
$rpmspec_obsoletes .= "Obsoletes: webmin-minimal < \%\{version\}-\%\{release\}\n"
if ($product_type eq 'essential');
$rpmspec_obsoletes = "\nObsoletes: webmin <= \%\{version\}-\%\{release\}\n",
$rpmspec_obsoletes .= "Conflicts: webmin <= \%\{version\}-\%\{release\}\n",
$rpmspec_obsoletes .= "\nObsoletes: webmin-essential <= \%\{version\}-\%\{release\}\n",
$rpmspec_obsoletes .= "Conflicts: webmin-essential <= \%\{version\}-\%\{release\}\n"
$rpmspec_obsoletes = "\n\nObsoletes: webmin < \%\{version\}-\%\{release\}\n",
$rpmspec_obsoletes .= "Obsoletes: webmin-essential < \%\{version\}-\%\{release\}\n"
if ($product_type eq 'minimal');
}
system("cp tarballs/$tarfile $source_dir");
@@ -108,7 +101,7 @@ Summary: A web-based administration interface for Unix systems.
Name: webmin$product_suff
Version: $ver
Release: $rel
Provides: %{name}-%{version}$provides_type perl(WebminCore)$rpmspec_obsoletes
Provides: %{name}-%{version} perl(WebminCore)$rpmspec_obsoletes
Requires(pre): /usr/bin/perl
Requires: /bin/sh /usr/bin/perl /bin/rm perl(lib) perl(open) perl(Net::SSLeay) perl(Time::Local) perl(Encode::Detect) perl(Data::Dumper) perl(File::Path) perl(File::Basename) perl(Digest::SHA) perl(Digest::MD5) openssl unzip tar
Recommends: perl(DateTime) perl(DateTime::TimeZone) perl(DateTime::Locale) perl(Time::Piece)