GIT Revision: 32f0a5c175540766e308da4940db0ebc5ca0f7d8

OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7170
2011-11-30 06:01:40 +00:00 · 2011-11-30 06:01:40 +00:00 · f6335bc899
commit f6335bc899
parent ff41f18d7e
31 changed files with 128 additions and 2 deletions
--- a/kernel-binary.spec.in
+++ b/kernel-binary.spec.in
@ -694,6 +694,7 @@ Group:          System/Kernel
 Url:            http://www.kernel.org/
 Provides:       multiversion(kernel)
 Provides:       kernel-base = %version-%source_rel
+Conflicts:      %name-base = %version-%release
 Requires(pre):  coreutils awk
 Requires(post): module-init-tools
 Requires(post): perl-Bootloader
--- a/kernel-debug.changes
+++ b/kernel-debug.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 29 19:59:18 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Make the -base package conflict with the main
+  one.
+- commit 45ada0d
+
 -------------------------------------------------------------------
 Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com

--- a/kernel-debug.spec
+++ b/kernel-debug.spec
@ -773,6 +773,7 @@ Group:          System/Kernel
 Url:            http://www.kernel.org/
 Provides:       multiversion(kernel)
 Provides:       kernel-base = %version-%source_rel
+Conflicts:      %name-base = %version-%release
 Requires(pre):  coreutils awk
 Requires(post): module-init-tools
 Requires(post): perl-Bootloader
--- a/kernel-default.changes
+++ b/kernel-default.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 29 19:59:18 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Make the -base package conflict with the main
+  one.
+- commit 45ada0d
+
 -------------------------------------------------------------------
 Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com

--- a/kernel-default.spec
+++ b/kernel-default.spec
@ -788,6 +788,7 @@ Group:          System/Kernel
 Url:            http://www.kernel.org/
 Provides:       multiversion(kernel)
 Provides:       kernel-base = %version-%source_rel
+Conflicts:      %name-base = %version-%release
 Requires(pre):  coreutils awk
 Requires(post): module-init-tools
 Requires(post): perl-Bootloader
--- a/kernel-desktop.changes
+++ b/kernel-desktop.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 29 19:59:18 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Make the -base package conflict with the main
+  one.
+- commit 45ada0d
+
 -------------------------------------------------------------------
 Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com

--- a/kernel-desktop.spec
+++ b/kernel-desktop.spec
@ -782,6 +782,7 @@ Group:          System/Kernel
 Url:            http://www.kernel.org/
 Provides:       multiversion(kernel)
 Provides:       kernel-base = %version-%source_rel
+Conflicts:      %name-base = %version-%release
 Requires(pre):  coreutils awk
 Requires(post): module-init-tools
 Requires(post): perl-Bootloader
--- a/kernel-docs.changes
+++ b/kernel-docs.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 29 19:59:18 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Make the -base package conflict with the main
+  one.
+- commit 45ada0d
+
 -------------------------------------------------------------------
 Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com

--- a/kernel-ec2.changes
+++ b/kernel-ec2.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 29 19:59:18 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Make the -base package conflict with the main
+  one.
+- commit 45ada0d
+
 -------------------------------------------------------------------
 Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com

--- a/kernel-ec2.spec
+++ b/kernel-ec2.spec
@ -772,6 +772,7 @@ Group:          System/Kernel
 Url:            http://www.kernel.org/
 Provides:       multiversion(kernel)
 Provides:       kernel-base = %version-%source_rel
+Conflicts:      %name-base = %version-%release
 Requires(pre):  coreutils awk
 Requires(post): module-init-tools
 Requires(post): perl-Bootloader
--- a/kernel-imx51.changes
+++ b/kernel-imx51.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 29 19:59:18 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Make the -base package conflict with the main
+  one.
+- commit 45ada0d
+
 -------------------------------------------------------------------
 Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com

--- a/kernel-imx51.spec
+++ b/kernel-imx51.spec
@ -770,6 +770,7 @@ Group:          System/Kernel
 Url:            http://www.kernel.org/
 Provides:       multiversion(kernel)
 Provides:       kernel-base = %version-%source_rel
+Conflicts:      %name-base = %version-%release
 Requires(pre):  coreutils awk
 Requires(post): module-init-tools
 Requires(post): perl-Bootloader
--- a/kernel-omap2plus.changes
+++ b/kernel-omap2plus.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 29 19:59:18 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Make the -base package conflict with the main
+  one.
+- commit 45ada0d
+
 -------------------------------------------------------------------
 Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com

--- a/kernel-omap2plus.spec
+++ b/kernel-omap2plus.spec
@ -770,6 +770,7 @@ Group:          System/Kernel
 Url:            http://www.kernel.org/
 Provides:       multiversion(kernel)
 Provides:       kernel-base = %version-%source_rel
+Conflicts:      %name-base = %version-%release
 Requires(pre):  coreutils awk
 Requires(post): module-init-tools
 Requires(post): perl-Bootloader
--- a/kernel-pae.changes
+++ b/kernel-pae.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 29 19:59:18 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Make the -base package conflict with the main
+  one.
+- commit 45ada0d
+
 -------------------------------------------------------------------
 Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com

--- a/kernel-pae.spec
+++ b/kernel-pae.spec
@ -779,6 +779,7 @@ Group:          System/Kernel
 Url:            http://www.kernel.org/
 Provides:       multiversion(kernel)
 Provides:       kernel-base = %version-%source_rel
+Conflicts:      %name-base = %version-%release
 Requires(pre):  coreutils awk
 Requires(post): module-init-tools
 Requires(post): perl-Bootloader
--- a/kernel-ppc64.changes
+++ b/kernel-ppc64.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 29 19:59:18 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Make the -base package conflict with the main
+  one.
+- commit 45ada0d
+
 -------------------------------------------------------------------
 Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com

--- a/kernel-ppc64.spec
+++ b/kernel-ppc64.spec
@ -783,6 +783,7 @@ Group:          System/Kernel
 Url:            http://www.kernel.org/
 Provides:       multiversion(kernel)
 Provides:       kernel-base = %version-%source_rel
+Conflicts:      %name-base = %version-%release
 Requires(pre):  coreutils awk
 Requires(post): module-init-tools
 Requires(post): perl-Bootloader
--- a/kernel-s390.changes
+++ b/kernel-s390.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 29 19:59:18 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Make the -base package conflict with the main
+  one.
+- commit 45ada0d
+
 -------------------------------------------------------------------
 Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com

--- a/kernel-s390.spec
+++ b/kernel-s390.spec
@ -772,6 +772,7 @@ Group:          System/Kernel
 Url:            http://www.kernel.org/
 Provides:       multiversion(kernel)
 Provides:       kernel-base = %version-%source_rel
+Conflicts:      %name-base = %version-%release
 Requires(pre):  coreutils awk
 Requires(post): module-init-tools
 Requires(post): perl-Bootloader
--- a/kernel-source.changes
+++ b/kernel-source.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 29 19:59:18 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Make the -base package conflict with the main
+  one.
+- commit 45ada0d
+
 -------------------------------------------------------------------
 Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com

--- a/kernel-syms.changes
+++ b/kernel-syms.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 29 19:59:18 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Make the -base package conflict with the main
+  one.
+- commit 45ada0d
+
 -------------------------------------------------------------------
 Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com

--- a/kernel-tegra.changes
+++ b/kernel-tegra.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 29 19:59:18 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Make the -base package conflict with the main
+  one.
+- commit 45ada0d
+
 -------------------------------------------------------------------
 Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com

--- a/kernel-tegra.spec
+++ b/kernel-tegra.spec
@ -770,6 +770,7 @@ Group:          System/Kernel
 Url:            http://www.kernel.org/
 Provides:       multiversion(kernel)
 Provides:       kernel-base = %version-%source_rel
+Conflicts:      %name-base = %version-%release
 Requires(pre):  coreutils awk
 Requires(post): module-init-tools
 Requires(post): perl-Bootloader
--- a/kernel-trace.changes
+++ b/kernel-trace.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 29 19:59:18 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Make the -base package conflict with the main
+  one.
+- commit 45ada0d
+
 -------------------------------------------------------------------
 Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com

--- a/kernel-trace.spec
+++ b/kernel-trace.spec
@ -780,6 +780,7 @@ Group:          System/Kernel
 Url:            http://www.kernel.org/
 Provides:       multiversion(kernel)
 Provides:       kernel-base = %version-%source_rel
+Conflicts:      %name-base = %version-%release
 Requires(pre):  coreutils awk
 Requires(post): module-init-tools
 Requires(post): perl-Bootloader
--- a/kernel-vanilla.changes
+++ b/kernel-vanilla.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 29 19:59:18 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Make the -base package conflict with the main
+  one.
+- commit 45ada0d
+
 -------------------------------------------------------------------
 Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com

--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@ -776,6 +776,7 @@ Group:          System/Kernel
 Url:            http://www.kernel.org/
 Provides:       multiversion(kernel)
 Provides:       kernel-base = %version-%source_rel
+Conflicts:      %name-base = %version-%release
 Requires(pre):  coreutils awk
 Requires(post): module-init-tools
 Requires(post): perl-Bootloader
--- a/kernel-xen.changes
+++ b/kernel-xen.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 29 19:59:18 CET 2011 - mmarek@suse.cz
+
+- rpm/kernel-binary.spec.in: Make the -base package conflict with the main
+  one.
+- commit 45ada0d
+
 -------------------------------------------------------------------
 Mon Nov 28 17:07:17 CET 2011 - jeffm@suse.com

--- a/kernel-xen.spec
+++ b/kernel-xen.spec
@ -772,6 +772,7 @@ Group:          System/Kernel
 Url:            http://www.kernel.org/
 Provides:       multiversion(kernel)
 Provides:       kernel-base = %version-%source_rel
+Conflicts:      %name-base = %version-%release
 Requires(pre):  coreutils awk
 Requires(post): module-init-tools
 Requires(post): perl-Bootloader
--- a/4
+++ b/4
@ -1,3 +1,3 @@
-2011-11-28 22:17:55 +0100
-GIT Revision: f223ee652010d2179a7287193aa4d7e6db362131
+2011-11-29 19:59:54 +0100
+GIT Revision: 32f0a5c175540766e308da4940db0ebc5ca0f7d8
 GIT Branch: master