Accepting request 210038 from Kernel:HEAD

- Correct Supplements string so that the package gets correctly installed
  on machines with Intel CPUs
  bnc#847158

- Use qlogic firmware from linux-firmware instead of the separate
  archive (bnc#846629).

OBS-URL: https://build.opensuse.org/request/show/210038
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kernel-firmware?expand=0&rev=41

kernel-firmware.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Dec  9 14:19:50 UTC 2013 - trenn@suse.de
+
+- Correct Supplements string so that the package gets correctly installed
+  on machines with Intel CPUs
+  bnc#847158
+
+-------------------------------------------------------------------
+Mon Oct 21 22:32:10 UTC 2013 - jeffm@suse.com
+
+- Use qlogic firmware from linux-firmware instead of the separate
+  archive (bnc#846629).
+
 -------------------------------------------------------------------
 Mon Jul 29 14:09:07 UTC 2013 - jeffm@suse.com
 

kernel-firmware.spec

@@ -16,6 +16,7 @@
 #
 
 
+
 Name:           kernel-firmware
 BuildRequires:  fdupes
 BuildRequires:  kernel-default
@@ -28,7 +29,6 @@ Url:            http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.g
 # Created with git archive | bzip2
 Source0:        linux-firmware-%{version}.tar.bz2
 Source1:        firmware.sh
-Source2:        qlogic.tar.bz2
 Source3:        iwlwifi-4965-1.ucode
 Source4:        carl9170-1.fw
 %define __find_supplements bash %_sourcedir/firmware.sh --find-supplements
@@ -72,16 +72,15 @@ previously included in the kernel. It is shared by all kernels >=
 2.6.27-rc1.
 
 %package -n ucode-amd
-Supplements:    modalias(x86cpu:vendor:0002:family:*:model:*:feature:*)
+Supplements:    modalias(x86cpu:vendor%3A0002%3Afamily%3A*%3Amodel%3A*%3Afeature%3A*)
 Summary:        Microcode updates for AMD CPUs
 Group:          System/Kernel
 
 %description -n ucode-amd
-
 This package contains the microcode files used by AMD CPUs.
 
 %prep
-%setup -q -c kernel-firmware -a 2
+%setup -q -c kernel-firmware
 cp -v %{S:3} iwlwifi-4965-1.ucode
 cp -v %{S:4} carl9170-1.fw
 

qlogic.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:53c628b99e43ee69384dab2bb3e60ac6b7ba41f52b22dded9ebfe6cc2b0db863
-size 416209