fix ftbfs, update spec

This commit is contained in:
Peter Robinson 2014-06-17 11:58:10 +01:00
parent c31eb7183f
commit 0e4783660f

View File

@ -5,17 +5,16 @@
Summary: Firmware for several ALSA-supported sound cards Summary: Firmware for several ALSA-supported sound cards
Name: alsa-firmware Name: alsa-firmware
Version: 1.0.27 Version: 1.0.27
Release: 4%{?dist} Release: 5%{?dist}
# See later in the spec for a breakdown of licensing # See later in the spec for a breakdown of licensing
License: GPL+ and BSD and GPLv2+ and GPLv2 and LGPLv2+ License: GPL+ and BSD and GPLv2+ and GPLv2 and LGPLv2+
Group: Applications/Multimedia Group: Applications/Multimedia
URL: http://www.alsa-project.org/ URL: http://www.alsa-project.org/
Source: ftp://ftp.alsa-project.org/pub/firmware/%{name}-%{version}.tar.bz2 Source: ftp://ftp.alsa-project.org/pub/firmware/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: alsa-tools-firmware >= %{version} Requires: alsa-tools-firmware >= %{version}
Requires: udev Requires: systemd
BuildRequires: automake BuildRequires: libtool autoconf automake
BuildRequires: autoconf
# noarch, since the package is firmware # noarch, since the package is firmware
BuildArch: noarch BuildArch: noarch
@ -46,9 +45,7 @@ the alsa-tools-firmware package.
sed -i s#'multisound/Makefile \\'## configure.in sed -i s#'multisound/Makefile \\'## configure.in
sed -i s#multisound## Makefile.am sed -i s#multisound## Makefile.am
%__aclocal autoreconf -vif
%__automake
%__autoconf
%configure --disable-loader %configure --disable-loader
make %{?_smp_mflags} make %{?_smp_mflags}
@ -62,15 +59,10 @@ mv aica/Dreamcast_sound.txt aica_dreamcast_sound.txt
mv ca0132/creative.txt LICENSE.creative_txt mv ca0132/creative.txt LICENSE.creative_txt
%install %install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
%clean
rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-)
%doc COPYING README* LICENSE* %doc COPYING README* LICENSE*
%doc aica_dreamcast_sound.txt %doc aica_dreamcast_sound.txt
@ -200,6 +192,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Jun 17 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.0.27-5
- Fix FTBFS once more with feeling
- Update spec
* Sun Jun 15 2014 Tim Jackson <rpm@timj.co.uk> - 1.0.27-4 * Sun Jun 15 2014 Tim Jackson <rpm@timj.co.uk> - 1.0.27-4
- Fix FTBFS (rhbz#1105946) - Fix FTBFS (rhbz#1105946)