GIT Revision: 32f0a5c175540766e308da4940db0ebc5ca0f7d8

OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7170

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

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
 

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

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
 

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

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
 

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

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
 

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
 

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

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
 

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

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
 

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

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
 

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

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
 

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

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
 

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

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
 

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
 

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
 

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

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
 

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

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
 

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

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
 

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

source-timestamp

@@ -1,3 +1,3 @@
-2011-11-28 22:17:55 +0100
+2011-11-29 19:59:54 +0100
-GIT Revision: f223ee652010d2179a7287193aa4d7e6db362131
+GIT Revision: 32f0a5c175540766e308da4940db0ebc5ca0f7d8
 GIT Branch: master