commit f60d3bcd2a165c93b9feef3ec061df2b5222c0cb
Author: Elan Ruusamäe <[email protected]>
Date:   Wed Sep 12 17:04:59 2012 +0300

    use Conflicts to ensure linux-firmware upgrade

 kernel.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/kernel.spec b/kernel.spec
index f02e3d5..ad9b427 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -297,7 +297,7 @@ Requires:   cpuinfo(pae)
 %endif
 Suggests:      dracut
 Suggests:      keyutils
-Suggests:      linux-firmware >= 20120720
+Suggests:      linux-firmware
 Provides:      %{name}(netfilter) = 20070806
 Provides:      %{name}(vermagic) = %{kernel_release}
 Obsoletes:     kernel%{_alt_kernel}-char-lirc-ene0100
@@ -320,6 +320,7 @@ Obsoletes:  kernel-smp
 Conflicts:     e2fsprogs < 1.29
 Conflicts:     isdn4k-utils < 3.1pre1
 Conflicts:     jfsutils < 1.1.3
+Conflicts:     linux-firmware < 20120720
 Conflicts:     lvm2 < 2.02.40
 Conflicts:     module-init-tools < 3.16
 Conflicts:     nfs-utils < 1.0.5
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/f60d3bcd2a165c93b9feef3ec061df2b5222c0cb

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to