diff --git a/.gitignore b/.gitignore index e46f8d9..b0f0010 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ alsa-firmware-1.0.19-pruned.tar.bz2 /alsa-firmware-1.0.24.1-pruned.tar.bz2 /alsa-firmware-1.0.25.tar.bz2 /alsa-firmware-1.0.25-pruned.tar.bz2 +/alsa-firmware-1.0.27.tar.bz2 diff --git a/alsa-firmware.README b/alsa-firmware.README deleted file mode 100644 index 7650d83..0000000 --- a/alsa-firmware.README +++ /dev/null @@ -1,13 +0,0 @@ -Firmware for ALSA ------------------ -This package has been put together by Tim Jackson (rpm@timj.co.uk) from an -original fedora.us spec file. - -Since the packager does not have access to most of the hardware for which -firmware is provided in this package, reports of success or otherwise are -welcome, as is any help with the package. - -Not all firmware which is included in the upstream alsa-firmware release is -necessarily included in this Fedora package, notably the "turtlebeach" firmware. -If there is something missing from this package and you need it, please contact -the packager. diff --git a/alsa-firmware.spec b/alsa-firmware.spec index 66b4399..7413f82 100644 --- a/alsa-firmware.spec +++ b/alsa-firmware.spec @@ -4,19 +4,13 @@ Summary: Firmware for several ALSA-supported sound cards Name: alsa-firmware -Version: 1.0.25 -Release: 3%{?dist} +Version: 1.0.27 +Release: 1%{?dist} # See later in the spec for a breakdown of licensing License: GPL+ and BSD and GPLv2+ and GPLv2 and LGPLv2+ Group: Applications/Multimedia URL: http://www.alsa-project.org/ -# This source removes the emi_26_62 firmware which is under a questionable -# license. See bug #217259. -# To generate the "pruned" tarball, extract the original source, remove -# the emi_26_62 directory and create a new tarball with a "-pruned" suffix. -# Original source: ftp://ftp.alsa-project.org/pub/firmware/%{name}-%{version}.tar.bz2 -Source0: %{name}-%{version}-pruned.tar.bz2 -Source1: alsa-firmware.README +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: udev @@ -37,9 +31,6 @@ the alsa-tools-firmware package. %build -# emi_26_62 is not in the pruned tarball -sed -i s#'emi_26_62/Makefile \\'## configure.in -sed -i s#emi_26_62## Makefile.am # Leaving this directory in place ends up with the following crazy, broken # symlinks in the output RPM, with no sign of the actual firmware (*.bin) files @@ -62,16 +53,17 @@ sed -i s#multisound## Makefile.am make %{?_smp_mflags} # Rename README files from firmware subdirs that have them -for i in hdsploader mixartloader pcxhrloader usx2yloader vxloader +for i in hdsploader mixartloader pcxhrloader usx2yloader vxloader ca0132 do mv ${i}/README README.${i} done - +mv aica/license.txt LICENSE.aica_firmware +mv aica/Dreamcast_sound.txt aica_dreamcast_sound.txt +mv ca0132/creative.txt LICENSE.creative_txt %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=%{buildroot} -cp -p %{SOURCE1} README.fedora %clean rm -rf $RPM_BUILD_ROOT @@ -79,7 +71,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc COPYING README* +%doc COPYING README* LICENSE* +%doc aica_dreamcast_sound.txt # License: KOS (BSD-alike) /lib/firmware/aica_firmware.bin @@ -195,6 +188,10 @@ rm -rf $RPM_BUILD_ROOT # See ALSA bug #3412 /lib/firmware/yamaha +# Licence: Redistribution allowed, see ca0132/creative.txt +/lib/firmware/ctefx.bin +/lib/firmware/ctspeq.bin + # Even with --disable-loader, we still get usxxx firmware here; looking at the # alsa-tools-firmware package, it seems like these devices probably use an old- # style hotplug loading method @@ -203,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Apr 12 2013 Jaroslav Kysela - 1.0.27-1 +- Update to 1.0.27 + * Wed Feb 13 2013 Fedora Release Engineering - 1.0.25-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 949bf1d..030cdce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -af360529792fd51896ef42c7389c3fd5 alsa-firmware-1.0.25-pruned.tar.bz2 +b373b350d5151dd7d64db2fc12936b04 alsa-firmware-1.0.27.tar.bz2