rpms/acpica-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove use of alternatives for acpidump/acpixtract; closes BZ#1576970

Browse Source 
These commands no longer have alternatives so there's really no need
for this any longer.

Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2018-05-15 10:10:19 -06:00
parent 139255447b
commit a67fb1a302
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
acpica-tools.spec
View File

@ -173,16 +173,10 @@ make
# Install the binaries # Install the binaries
mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_bindir}
install -pD generate/unix/bin*/* %{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 # Install the man pages
mkdir -p %{buildroot}%{_mandir}/man1 mkdir -p %{buildroot}%{_mandir}/man1
install -pDm 0644 -p -D *.1 %{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 %check
cd tests cd tests
@ -206,18 +200,15 @@ then
fi fi
cd .. cd ..
%pre
%post if [ ! -e %{_bindir}/acpixtract-acpica ]
alternatives --install %{_bindir}/acpixtract acpixtract \ then
%{_bindir}/acpixtract-acpica 120 \ alternatives --remove acpixtract %{_bindir}/acpixtract-acpica
--slave %{_mandir}/man1/acpixtract.1.gz acpixtract.1.gz \ fi
%{_mandir}/man1/acpixtract-acpica.1.gz if [ ! -e %{_bindir}/acpidump-acpica ]
then
alternatives --install %{_bindir}/acpidump acpidump \ alternatives --remove acpidump %{_bindir}/acpidump-acpica
%{_bindir}/acpidump-acpica 120 \ fi
--slave %{_mandir}/man1/acpidump.1.gz acpidump.1.gz \
%{_mandir}/man1/acpidump-acpica.1.gz
%postun %postun
if [ ! -e %{_bindir}/acpixtract-acpica ] if [ ! -e %{_bindir}/acpixtract-acpica ]
@ -238,8 +229,11 @@ fi
%changelog %changelog
* Mon May 14 2018 Al Stone <ahs3@redhat.com> - 20180508-1 * Tue May 15 2018 Al Stone <ahs3@redhat.com> - 20180508-1
- Update to 20180508 source tree, including patch refeshes. Closes BZ#1544048 - 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 <ahs3@redhat.com> - 20180427-1 * Mon May 14 2018 Al Stone <ahs3@redhat.com> - 20180427-1
- Update to 20180427 source tree, including patch refeshes. Closes BZ#1544048 - Update to 20180427 source tree, including patch refeshes. Closes BZ#1544048