From 6325aeb58e79e98dfb8f94925f18f7b7c7fec424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Tue, 26 Feb 2019 10:58:07 +0100 Subject: [PATCH] Adjust whois-mkpasswd obsoleteness to 5.4.1 rebase --- whois.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/whois.spec b/whois.spec index 61cb96f..27c9186 100644 --- a/whois.spec +++ b/whois.spec @@ -7,7 +7,7 @@ Name: whois Version: 5.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Improved WHOIS client License: GPLv2+ URL: http://www.linux.it/~md/software/ @@ -54,11 +54,13 @@ addresses and network names. %if %{with whois_enables_mkpasswd} %package -n mkpasswd Summary: Encrypt a password with crypt(3) function using a salt -# /usr/bin/mkpasswd was provided by "expect" package, bug 1649426 +# /usr/bin/mkpasswd was provided by "expect" package, bug #1649426 Conflicts: expect < 5.45.4-8.fc30 Requires: whois-nls = %{version}-%{release} -# whois-mkpasswd package renamed to mkpasswd, bug #bug 1649426 +# whois-mkpasswd package renamed to mkpasswd in 5.4.0-2.fc30, bug #1649426 Obsoletes: whois-mkpasswd <= 5.4.0-1.fc30 +# but we continue upgrading whois in older Fedoras without the rename +Obsoletes: whois-mkpasswd <= 5.4.1-1.fc29 Provides: whois-mkpasswd = %{version}-%{release} %description -n mkpasswd @@ -133,6 +135,9 @@ fi %endif %changelog +* Tue Feb 26 2019 Petr Pisar - 5.4.1-3 +- Adjust whois-mkpasswd obsoleteness to 5.4.1 rebase (bug #1649426) + * Sun Feb 03 2019 Fedora Release Engineering - 5.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild