Hello community, here is the log from the commit of package alsa-firmware for openSUSE:Factory checked in at 2020-01-14 21:05:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-firmware (Old) and /work/SRC/openSUSE:Factory/.alsa-firmware.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-firmware" Tue Jan 14 21:05:42 2020 rev:42 rq:764313 version:1.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-firmware/alsa-firmware.changes 2019-12-05 17:33:38.813454058 +0100 +++ /work/SRC/openSUSE:Factory/.alsa-firmware.new.6675/alsa-firmware.changes 2020-01-14 21:09:09.786815078 +0100 @@ -1,0 +2,10 @@ +Tue Jan 14 14:46:03 CET 2020 - [email protected] + +- Comment out superfluous buildreq automake +- Run fdupes for reducing the duplications +- Remove conflicting CA0132 files against kernel-firmware +- Add supplements for the automatic installation +- Install license-related files into licensesdir +- Drop the support for old distros (<1200), drop old udev rules + +------------------------------------------------------------------- Old: ---- usx2yaudio-old.rules ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-firmware.spec ++++++ --- /var/tmp/diff_new_pack.3xgzie/_old 2020-01-14 21:09:11.514815877 +0100 +++ /var/tmp/diff_new_pack.3xgzie/_new 2020-01-14 21:09:11.526815883 +0100 @@ -1,7 +1,7 @@ # # spec file for package alsa-firmware # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,9 +19,10 @@ Name: alsa-firmware Url: http://www.alsa-project.org/ Summary: Firmware Data Files for ALSA +# BuildRequires: automake License: GPL-2.0-or-later Group: Hardware/Other -BuildRequires: automake +BuildRequires: fdupes %if 0%{?suse_version} > 1220 BuildRequires: pkgconfig BuildRequires: pkgconfig(udev) @@ -30,10 +31,40 @@ Release: 0 Source: ftp://ftp.alsa-project.org/pub/firmware/alsa-firmware-%{version}.tar.bz2 Source1: usx2yaudio.rules -Source2: usx2yaudio-old.rules BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Requires: alsa +# for asihpi +Supplements: modalias(pci:v0000104Cd0000AC60sv0000175Csd*bc*sc*i*) +Supplements: modalias(pci:v0000104Cd0000A106sv0000175Csd*bc*sc*i*) +# for ca0132 +Supplements: modalias(pci:v00001102d00000010sv*sd*bc*sc*i*) +Supplements: modalias(pci:v00001102d00000012sv*sd*bc*sc*i*) +# for cs46xx +Supplements: modalias(pci:v00001013d00006004sv*sd*bc*sc*i*) +Supplements: modalias(pci:v00001013d00006003sv*sd*bc*sc*i*) +Supplements: modalias(pci:v00001013d00006001sv*sd*bc*sc*i*) +# for echoaudio +Supplements: modalias(pci:v00001057d00001801sv0000ECC0sd*bc*sc*i*) +Supplements: modalias(pci:v00001057d00003410sv0000ECC0sd*bc*sc*i*) +# for emu10k1 +Supplements: modalias(pci:v00001102d00000008sv*sd*bc*sc*i*) +Supplements: modalias(pci:v00001102d00000004sv*sd*bc*sc*i*) +Supplements: modalias(pci:v00001102d00000002sv*sd*bc*sc*i*) +# for hdsp +Supplements: modalias(pci:v000010EEd00003FC5sv*sd*bc*sc*i*) +# for mixart +Supplements: modalias(pci:v00001057d00000003sv*sd*bc*sc*i*) +# for pcxhr +Supplements: modalias(pci:v000010B5d00009056sv00001369sd*bc*sc*i*) +# for usx2y +Supplements: modalias(usb:v1604p8005d*dc*dsc*dp*ic*isc*ip*in*) +Supplements: modalias(usb:v1604p8007d*dc*dsc*dp*ic*isc*ip*in*) +Supplements: modalias(usb:v1604p8001d*dc*dsc*dp*ic*isc*ip*in*) +# for vx +Supplements: modalias(pci:v000010B5d00009030sv00001369sd*bc*sc*i*) +Supplements: modalias(pci:v000010B5d00009050sv00001369sd*bc*sc*i*) + %if 0%{?suse_version} > 1220 %define _udevdir %(pkg-config --variable=udevdir udev) %else @@ -55,21 +86,22 @@ make %{?_smp_mflags} %install -make DESTDIR="$RPM_BUILD_ROOT" install +make DESTDIR="%{buildroot}" install +# remove duplicated entries that are already in kernel-firmware package +rm -f %{buildroot}/lib/firmware/ctefx.bin +rm -f %{buildroot}/lib/firmware/ctspeq.bin # remove unnecessary loader firmwares for d in vxloader mixartloader pcxhrloader; do - rm -rf $RPM_BUILD_ROOT%{_datadir}/alsa/firmware/$d + rm -rf %{buildroot}%{_datadir}/alsa/firmware/$d done -%if 0%{?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 + rm -rf %{buildroot}/lib/firmware/$d done -%endif # change identical files to symlinks for hdsploader -pushd $RPM_BUILD_ROOT%{_datadir}/alsa/firmware/hdsploader +pushd %{buildroot}%{_datadir}/alsa/firmware/hdsploader for i in *.bin; do - hotplug=$RPM_BUILD_ROOT/lib/firmware/$i + hotplug=%{buildroot}/lib/firmware/$i if [ -f $hotplug ]; then if cmp -s -b $hotplug $i; then rm $i @@ -79,29 +111,38 @@ done popd # FIXME: remove non-existing msnd firmware symlinks -rm -rf $RPM_BUILD_ROOT/lib/firmware/turtlebeach +rm -rf %{buildroot}/lib/firmware/turtlebeach # install documents -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} +mkdir -p %{buildroot}%{_docdir}/%{name} +mkdir -p %{buildroot}%{_licensedir}/%{name} +install -c -m 0644 COPYING %{buildroot}%{_licensedir}/%{name} +install -c -m 0644 README %{buildroot}%{_docdir}/%{name} for d in echoaudio hdsploader mixartloader pcxhrloader usx2yloader vxloader asihpi ca0132; do (cd $d n=${d##*/} - mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/$n - for f in AUTHORS COPYING ChangeLog NEWS README* TODO creative.txt; do + mkdir -p %{buildroot}%{_docdir}/%{name}/$n + for f in AUTHORS ChangeLog README* TODO *.txt; do test -f $f || continue - install -c -m 0644 $f $RPM_BUILD_ROOT%{_docdir}/%{name}/$n + case $f in + licen[cs]e*) + mkdir -p %{buildroot}%{_licensedir}/%{name}/$n + install -c -m 0644 $f %{buildroot}%{_licensedir}/%{name}/$n + ;; + *) + install -c -m 0644 $f %{buildroot}%{_docdir}/%{name}/$n + ;; + esac done ) done # udev rules -%if 0%{?suse_version} > 1020 -install -D -c -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_udevdir}/rules.d/52-usx2yaudio.rules -%else -install -D -c -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_udevdir}/rules.d/52-usx2yaudio.rules -%endif +install -D -c -m 0644 %{SOURCE1} %{buildroot}%{_udevdir}/rules.d/52-usx2yaudio.rules +%fdupes -s %{buildroot} %files %defattr(-, root, root) %doc %{_docdir}/%{name} +%license %{_licensedir}/%{name} /lib/firmware/* %{_datadir}/alsa %{_udevdir}
