- R: AMD and Intel microcode

[packages/linux-firmware.git] / linux-firmware.spec

diff --git a/linux-firmware.spec b/linux-firmware.spec
index adc63daffc5b4460ecfc083574ff502cbfa71f1c..68d7d5f29b501d75cbd0baeb120a62fe18cd9da7 100644 (file)
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,4 +1,4 @@
-%define                rel     1
+%define                rel     2
 %define                ver     20190514
 Summary:       Firmware files used by the Linux kernel
 Summary(pl.UTF-8):     Pliki firmware'u używane przez jądro Linuksa
@@ -10,7 +10,8 @@ Group:                Base/Kernel
 Source0:       https://src.fedoraproject.org/repo/pkgs/linux-firmware/%{name}-%{version}.tar.xz/sha512/6de58e28892b06d88a74750957596eb17227a684a9603ff29a01f3c5712f40a79128aec3a94dfb71d0cfabd918a9add4216d4f8e9ef91c5c40859fb160422685/linux-firmware-%{version}.tar.xz
 # Source0-md5: cb27c6f0348b45794ca1af7309d8632c
 URL:           https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
-Obsoletes:     microcode-data-amd
+Requires:      microcode-data-amd
+Requires:      microcode-data-intel
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -379,6 +380,8 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/lib/firmware
 cp -a . $RPM_BUILD_ROOT/lib/firmware
 %{__rm} $RPM_BUILD_ROOT/lib/firmware/{GPL-2,GPL-3,LICENCE.*,LICENSE.*,README,TDA7706_OM_v*_boot.txt,WHENCE,check_whence.py}
+# For AMD CPU microcode see microcode-data-amd.spec
+%{__rm} -r $RPM_BUILD_ROOT/lib/firmware/amd-ucode
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -394,7 +397,6 @@ rm -rf $RPM_BUILD_ROOT
 /lib/firmware/advansys
 /lib/firmware/agere_*_fw.bin
 /lib/firmware/amd
-/lib/firmware/amd-ucode
 /lib/firmware/as102_data1_st.hex
 /lib/firmware/as102_data2_st.hex
 /lib/firmware/atmel