From a67fb1a3027bd06f7f2dd4f686f566a8e3efdc78 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Tue, 15 May 2018 10:10:19 -0600 Subject: [PATCH] Remove use of alternatives for acpidump/acpixtract; closes BZ#1576970 These commands no longer have alternatives so there's really no need for this any longer. Signed-off-by: Al Stone --- acpica-tools.spec | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/acpica-tools.spec b/acpica-tools.spec index 2fca292..268ee08 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -173,16 +173,10 @@ make # Install the binaries mkdir -p %{buildroot}%{_bindir} install -pD generate/unix/bin*/* %{buildroot}%{_bindir}/ -mv %{buildroot}%{_bindir}/acpidump %{buildroot}%{_bindir}/acpidump-acpica -mv %{buildroot}%{_bindir}/acpixtract %{buildroot}%{_bindir}/acpixtract-acpica # Install the man pages mkdir -p %{buildroot}%{_mandir}/man1 install -pDm 0644 -p -D *.1 %{buildroot}%{_mandir}/man1/ -mv %{buildroot}%{_mandir}/man1/acpixtract.1 \ - %{buildroot}%{_mandir}/man1/acpixtract-acpica.1 -mv %{buildroot}%{_mandir}/man1/acpidump.1 \ - %{buildroot}%{_mandir}/man1/acpidump-acpica.1 %check cd tests @@ -206,18 +200,15 @@ then fi cd .. - -%post -alternatives --install %{_bindir}/acpixtract acpixtract \ - %{_bindir}/acpixtract-acpica 120 \ - --slave %{_mandir}/man1/acpixtract.1.gz acpixtract.1.gz \ - %{_mandir}/man1/acpixtract-acpica.1.gz - -alternatives --install %{_bindir}/acpidump acpidump \ - %{_bindir}/acpidump-acpica 120 \ - --slave %{_mandir}/man1/acpidump.1.gz acpidump.1.gz \ - %{_mandir}/man1/acpidump-acpica.1.gz - +%pre +if [ ! -e %{_bindir}/acpixtract-acpica ] +then + alternatives --remove acpixtract %{_bindir}/acpixtract-acpica +fi +if [ ! -e %{_bindir}/acpidump-acpica ] +then + alternatives --remove acpidump %{_bindir}/acpidump-acpica +fi %postun if [ ! -e %{_bindir}/acpixtract-acpica ] @@ -238,8 +229,11 @@ fi %changelog -* Mon May 14 2018 Al Stone - 20180508-1 +* Tue May 15 2018 Al Stone - 20180508-1 - Update to 20180508 source tree, including patch refeshes. Closes BZ#1544048 +- acpidump/acpixtract no longer have alternatives, so remove the scriptlets + that maintain them and just install them directly; we do leave the pre- + and post- scriptlets to remove the alternatives for now. Closes BZ#1576970 * Mon May 14 2018 Al Stone - 20180427-1 - Update to 20180427 source tree, including patch refeshes. Closes BZ#1544048