From f6335bc8998d121bef333313a51bf1d37d36cac35bcd0b956d5b762d330200d7 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Wed, 30 Nov 2011 06:01:40 +0000 Subject: [PATCH] GIT Revision: 32f0a5c175540766e308da4940db0ebc5ca0f7d8 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7170 --- kernel-binary.spec.in | 1 + kernel-debug.changes | 7 +++++++ kernel-debug.spec | 1 + kernel-default.changes | 7 +++++++ kernel-default.spec | 1 + kernel-desktop.changes | 7 +++++++ kernel-desktop.spec | 1 + kernel-docs.changes | 7 +++++++ kernel-ec2.changes | 7 +++++++ kernel-ec2.spec | 1 + kernel-imx51.changes | 7 +++++++ kernel-imx51.spec | 1 + kernel-omap2plus.changes | 7 +++++++ kernel-omap2plus.spec | 1 + kernel-pae.changes | 7 +++++++ kernel-pae.spec | 1 + kernel-ppc64.changes | 7 +++++++ kernel-ppc64.spec | 1 + kernel-s390.changes | 7 +++++++ kernel-s390.spec | 1 + kernel-source.changes | 7 +++++++ kernel-syms.changes | 7 +++++++ kernel-tegra.changes | 7 +++++++ kernel-tegra.spec | 1 + kernel-trace.changes | 7 +++++++ kernel-trace.spec | 1 + kernel-vanilla.changes | 7 +++++++ kernel-vanilla.spec | 1 + kernel-xen.changes | 7 +++++++ kernel-xen.spec | 1 + source-timestamp | 4 ++-- 31 files changed, 128 insertions(+), 2 deletions(-) diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index afc848772..173769907 100644 --- 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 diff --git a/kernel-debug.changes b/kernel-debug.changes index da5a23b87..03bf08de5 100644 --- 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 diff --git a/kernel-debug.spec b/kernel-debug.spec index 0d8e78771..137b7ce18 100644 --- 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 diff --git a/kernel-default.changes b/kernel-default.changes index da5a23b87..03bf08de5 100644 --- 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 diff --git a/kernel-default.spec b/kernel-default.spec index 2bac175de..3dfc2423f 100644 --- 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 diff --git a/kernel-desktop.changes b/kernel-desktop.changes index da5a23b87..03bf08de5 100644 --- 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 diff --git a/kernel-desktop.spec b/kernel-desktop.spec index c5125bffb..7b5cfe3ec 100644 --- 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 diff --git a/kernel-docs.changes b/kernel-docs.changes index da5a23b87..03bf08de5 100644 --- 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 diff --git a/kernel-ec2.changes b/kernel-ec2.changes index da5a23b87..03bf08de5 100644 --- 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 diff --git a/kernel-ec2.spec b/kernel-ec2.spec index 1cefe2ef4..4eb138774 100644 --- 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 diff --git a/kernel-imx51.changes b/kernel-imx51.changes index da5a23b87..03bf08de5 100644 --- 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 diff --git a/kernel-imx51.spec b/kernel-imx51.spec index 484339e2e..aff280263 100644 --- 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 diff --git a/kernel-omap2plus.changes b/kernel-omap2plus.changes index da5a23b87..03bf08de5 100644 --- 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 diff --git a/kernel-omap2plus.spec b/kernel-omap2plus.spec index f17d694ae..c66a77875 100644 --- 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 diff --git a/kernel-pae.changes b/kernel-pae.changes index da5a23b87..03bf08de5 100644 --- 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 diff --git a/kernel-pae.spec b/kernel-pae.spec index 288da0356..96e0198ed 100644 --- 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 diff --git a/kernel-ppc64.changes b/kernel-ppc64.changes index da5a23b87..03bf08de5 100644 --- 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 diff --git a/kernel-ppc64.spec b/kernel-ppc64.spec index fef6e0db9..d5400f5a1 100644 --- 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 diff --git a/kernel-s390.changes b/kernel-s390.changes index da5a23b87..03bf08de5 100644 --- 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 diff --git a/kernel-s390.spec b/kernel-s390.spec index 8eb0effae..da00e8726 100644 --- 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 diff --git a/kernel-source.changes b/kernel-source.changes index da5a23b87..03bf08de5 100644 --- 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 diff --git a/kernel-syms.changes b/kernel-syms.changes index da5a23b87..03bf08de5 100644 --- 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 diff --git a/kernel-tegra.changes b/kernel-tegra.changes index da5a23b87..03bf08de5 100644 --- 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 diff --git a/kernel-tegra.spec b/kernel-tegra.spec index 05a921832..99dd65e1e 100644 --- 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 diff --git a/kernel-trace.changes b/kernel-trace.changes index da5a23b87..03bf08de5 100644 --- 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 diff --git a/kernel-trace.spec b/kernel-trace.spec index 22f915aa3..f2538be13 100644 --- 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 diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index da5a23b87..03bf08de5 100644 --- 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 diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index a7972f867..e8fa380c2 100644 --- 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 diff --git a/kernel-xen.changes b/kernel-xen.changes index da5a23b87..03bf08de5 100644 --- 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 diff --git a/kernel-xen.spec b/kernel-xen.spec index 2751c56c6..0b18b0588 100644 --- 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 diff --git a/source-timestamp b/source-timestamp index 33aa8e071..a21703151 100644 --- a/source-timestamp +++ b/source-timestamp @@ -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