Fix Bug 909622 - don't use %makeinstall
This commit is contained in:
parent
130ea7bb73
commit
ead3996293
@ -25,7 +25,7 @@
|
||||
Summary: Specialist tools for ALSA
|
||||
Name: alsa-tools
|
||||
Version: 1.0.28
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
|
||||
# Checked at least one source file from all the sub-projects contained in
|
||||
# the source tarball and they are consistent GPLv2+ - TJ 2007-11-15
|
||||
@ -119,27 +119,27 @@ for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw}
|
||||
do
|
||||
case $i in
|
||||
echomixer)
|
||||
(cd $i ; %makeinstall ; install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/applications/ ) || exit 1
|
||||
(cd $i ; %make_install ; install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/applications/ ) || exit 1
|
||||
;;
|
||||
envy24control)
|
||||
(cd $i ; %makeinstall ; install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/ ) || exit 1
|
||||
(cd $i ; %make_install ; install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/ ) || exit 1
|
||||
;;
|
||||
hdspconf)
|
||||
(cd $i ; %makeinstall pixmapdir=%{buildroot}%{_datadir}/pixmaps desktopdir=%{buildroot}%{_datadir}/applications ) || exit 1
|
||||
(cd $i ; %make_install ) || exit 1
|
||||
;;
|
||||
hdspmixer)
|
||||
(cd $i ; %makeinstall pixmapdir=%{buildroot}%{_datadir}/pixmaps desktopdir=%{buildroot}%{_datadir}/applications ) || exit 1
|
||||
(cd $i ; %make_install ) || exit 1
|
||||
;;
|
||||
hwmixvolume)
|
||||
(cd $i ; %makeinstall ; install -m 644 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE7} %{buildroot}%{_datadir}/applications/ ) || exit 1
|
||||
(cd $i ; %make_install ; install -m 644 %{SOURCE6} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE7} %{buildroot}%{_datadir}/applications/ ) || exit 1
|
||||
;;
|
||||
usx2yloader)
|
||||
(cd $i ; %makeinstall hotplugdir=%{buildroot}%{_sysconfdir}/hotplug/usb) || exit 1
|
||||
(cd $i ; %make_install hotplugdir=/lib/udev) || exit 1
|
||||
;;
|
||||
hdajackretask)
|
||||
(cd $i ; %makeinstall ; install -m 644 %{SOURCE9} %{buildroot}%{_datadir}/applications/ ) || exit 1
|
||||
(cd $i ; %make_install ; install -m 644 %{SOURCE9} %{buildroot}%{_datadir}/applications/ ) || exit 1
|
||||
;;
|
||||
*) (cd $i ; %makeinstall) || exit 1
|
||||
*) (cd $i ; %make_install) || exit 1
|
||||
esac
|
||||
if [[ -s "${i}"/README ]]
|
||||
then
|
||||
@ -164,9 +164,7 @@ do
|
||||
done
|
||||
|
||||
# convert hotplug stuff to udev
|
||||
rm -f %{buildroot}%{_sysconfdir}/hotplug/usb/tascam_fw.usermap
|
||||
mkdir -p %{buildroot}/lib/udev
|
||||
mv %{buildroot}%{_sysconfdir}/hotplug/usb/* %{buildroot}/lib/udev
|
||||
rm -f %{buildroot}/lib/udev/tascam_fw.usermap
|
||||
mkdir -p %{buildroot}/lib/udev/rules.d
|
||||
install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d
|
||||
|
||||
@ -235,6 +233,9 @@ install -m 644 %{SOURCE5} %{buildroot}/lib/udev/rules.d
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Jul 25 2014 Tim Jackson <rpm@timj.co.uk> 1.0.28-1
|
||||
- don't use %%makeinstall (RHBZ #909622)
|
||||
|
||||
* Thu Jul 24 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.0.28-1
|
||||
- Update to 1.0.28
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user