From 3aee0e069d0dc878a2b1bb36baf3b1dadd98d779 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Jul 25 2019 11:56:01 +0000 Subject: minor cleanups, drop some non end user files, move GPL-[23] files to %license section --- diff --git a/linux-firmware.spec b/linux-firmware.spec index f45a81c..9bd5fd7 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -310,14 +310,14 @@ rm -f libertas/usb8388_v5.bin # Remove firmware for Creative CA0132 HD as it's in alsa-firmware rm -f ctefx.bin ctspeq.bin -# Remove the check_whence.py file -rm -f check_whence.py +# Remove superfluous infra files +rm -f check_whence.py Makefile README %install mkdir -p %{buildroot}/%{_firmwarepath} mkdir -p %{buildroot}/%{_firmwarepath}/updates cp -r * %{buildroot}/%{_firmwarepath} -rm %{buildroot}/%{_firmwarepath}/{WHENCE,LICENCE.*,LICENSE.*} +rm %{buildroot}/%{_firmwarepath}/{GPL*,WHENCE,LICENCE.*,LICENSE.*} # Create file list but exclude firmwares that we place in subpackages FILEDIR=`pwd` @@ -338,6 +338,10 @@ sed -i -e 's/^/"/;s/$/"/' linux-firmware.files sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files +%files -f linux-firmware.files +%dir %{_firmwarepath} +%license LICENCE.* LICENSE.* GPL* + %files whence %license WHENCE @@ -434,10 +438,6 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files %dir %{_firmwarepath}/mrvl %{_firmwarepath}/mrvl/sd8787* -%files -f linux-firmware.files -%dir %{_firmwarepath} -%license LICENCE.* LICENSE.* - %files -n liquidio-firmware %license LICENCE.cavium_liquidio %dir %{_firmwarepath}/liquidio