From ac2b993995956b3de2a8de5ac27871ba2dba1718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Fri, 28 Feb 2020 17:22:30 +0100 Subject: [PATCH] fix upgrades from non-alternativized versions --- man-db.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/man-db.spec b/man-db.spec index 8e3a6cc..d565f6a 100644 --- a/man-db.spec +++ b/man-db.spec @@ -4,7 +4,7 @@ Summary: Tools for searching and reading man pages Name: man-db Version: 2.9.1 -Release: 3%{?dist} +Release: 4%{?dist} # GPLv2+ .. man-db # GPLv3+ .. gnulib License: GPLv2+ and GPLv3+ @@ -116,6 +116,9 @@ install -D -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/man-db-restart-cache %find_lang %{name}-gnulib %pre +# /usr/bin/man is now alternativized, so if it is not a symlink, remove it +[ -L %{_bindir}/man ] || rm -f %{_bindir}/man + # stop and disable timer from previous builds if [ -e /usr/lib/systemd/system/mandb.timer ]; then if test -d /run/systemd; then @@ -225,6 +228,9 @@ fi %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron %changelog +* Fri Feb 28 2020 Nikola Forró - 2.9.1-4 +- fix upgrades from non-alternativized versions + * Wed Feb 26 2020 Nikola Forró - 2.9.1-3 - fix %postun scriptlet