From 14b1b66c598bc07715f9cb6e82d7aed16999e99bfed2b0462412eeeac5514b30 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 8 Oct 2009 02:07:16 +0000 Subject: [PATCH] Accepting request 21856 from multimedia:libs Copy from multimedia:libs/alsa-firmware based on submit request 21856 from user tiwai OBS-URL: https://build.opensuse.org/request/show/21856 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alsa-firmware?expand=0&rev=17 --- alsa-firmware.changes | 5 +++ alsa-firmware.spec | 99 ++++--------------------------------------- 2 files changed, 13 insertions(+), 91 deletions(-) diff --git a/alsa-firmware.changes b/alsa-firmware.changes index 46f4242..9814763 100644 --- a/alsa-firmware.changes +++ b/alsa-firmware.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 5 17:28:25 CEST 2009 - tiwai@suse.de + +- really exclude firmware files in kernel-firmware package + ------------------------------------------------------------------- Wed May 6 18:11:28 CEST 2009 - tiwai@suse.de diff --git a/alsa-firmware.spec b/alsa-firmware.spec index e7dee02..477bfcf 100644 --- a/alsa-firmware.spec +++ b/alsa-firmware.spec @@ -23,7 +23,7 @@ Name: alsa-firmware Url: http://www.alsa-project.org/ Summary: Firmware Data Files for ALSA Version: 1.0.20 -Release: 1 +Release: 2 License: GPL v2 or later Group: Hardware/Other AutoReqProv: on @@ -52,14 +52,15 @@ make %install make DESTDIR="$RPM_BUILD_ROOT" install # remove unnecessary loader firmwares -to_remove="vxloader mixartloader pcxhrloader" -%if %suse_version >= 1120 -# some files are included in the new "kernel-firmware" package -to_remove="$to_remove ess korg sb16 yamaha" -%endif -for d in $to_remove; do +for d in vxloader mixartloader pcxhrloader; do rm -rf $RPM_BUILD_ROOT%{_datadir}/alsa/firmware/$d done +%if %suse_version >= 1120 +# some files are included in the new "kernel-firmware" package +for d in ess korg sb16 yamaha; do + rm -rf $RPM_BUILD_ROOT/lib/firmware/$d +done +%endif # change identical files to symlinks for hdsploader pushd $RPM_BUILD_ROOT%{_datadir}/alsa/firmware/hdsploader for i in *.bin; do @@ -105,87 +106,3 @@ install -c -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/udev/rules.d/52-usx2yaudio.rul /etc/udev %changelog -* Wed May 06 2009 tiwai@suse.de -- updated to version 1.0.20: - * just a version number bump -* Tue May 05 2009 tiwai@suse.de -- exclude some firmware files already contained in kernel-firmware - package -* Thu Mar 05 2009 ro@suse.de -- fix build -* Thu Jan 22 2009 tiwai@suse.de -- updated to version 1.0.19: - * updated PCXHR firmwares -* Tue Jul 15 2008 tiwai@suse.de -- updated to version 1.0.17: - * just a version bump -* Thu Jun 26 2008 tiwai@suse.de -- updated to version 1.0.17-rc2: - * update asihpi firmwares -* Fri Feb 08 2008 tiwai@suse.de -- updated to version 1.0.16-final: - * just a version bump -* Mon Jan 28 2008 tiwai@suse.de -- changed the package version number to 1.0.16 to match with - alsa-tools. -* Tue Jan 22 2008 tiwai@suse.de -- updated to version 1.0.16rc1: - * updated asihpi firmware data -* Tue Oct 16 2007 tiwai@suse.de -- updated to version 1.0.15-final: - * including all previous fixes -* Mon Jul 30 2007 tiwai@suse.de -- updated to firmware version (as of HG 2007.07.27) - including the latest ASIHPI binaries -- fixed udev rules for the recent 10.3 kernel. - keep the old config for older kernels. -* Tue Jun 05 2007 tiwai@suse.de -- removed alsa from BuildRequires -- fixed filelist to be independent from alsa.rpm -* Thu May 31 2007 tiwai@suse.de -- updated to version 1.0.14-final: - * aica firmware -* Wed May 02 2007 tiwai@suse.de -- updated to version 1.0.14rc4 - * emu micro_dock firmware -* Sun Mar 18 2007 aj@suse.de -- /lib/firmware is now in filesystem package. -* Wed Mar 14 2007 tiwai@suse.de -- updated to version 1.0.14rc3: - * updated asihpi firmwares - * added msnd-pinnacle firmwares - * fix usx2yaudio udev rules to call with proper -m option -* Wed Dec 20 2006 tiwai@suse.de -- updated to version 1.0.14rc1: - * added ymfpci, maestro3, korg1212 firmwares - * added wavefront and sb16 firmwares - * added emi26/emi62 firmwares -* Thu Oct 05 2006 tiwai@suse.de -- updated to version 1.0.13-final: - * no real change since rc2 -* Fri Sep 22 2006 tiwai@suse.de -- updated to version 1.0.13rc2: - * echoaduio firmware fixes -* Wed Aug 16 2006 tiwai@suse.de -- moved firmware-specific udev rules for usx2yaudio from alsa - package. -* Tue Jul 04 2006 tiwai@suse.de -- updated to version 1.0.12rc1: - * new firmwares for asihpi driver -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Wed Oct 12 2005 tiwai@suse.de -- updated to version 1.0.10rc2. -* Sat Aug 20 2005 schwab@suse.de -- Don't require hotplug. -* Thu Jun 02 2005 tiwai@suse.de -- updated to version 1.0.9-final. -* Tue May 24 2005 tiwai@suse.de -- updated to version 1.0.9rc4. -- enable loaders, use symlinks for identical files. -* Thu Jan 13 2005 tiwai@suse.de -- updated to version 1.0.8-final. -* Fri Jan 07 2005 tiwai@suse.de -- added alsa to neededforpackage for $(datadir)/alsa ownership. -* Wed Jan 05 2005 tiwai@suse.de -- split from alsa-tools: version 1.0.8rc2.