From ab26c953437e914261dfe9ad67404d2b4c676a445bdf0bbfd9ec05017c15cbd6 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Thu, 8 Dec 2011 06:01:35 +0000 Subject: [PATCH] GIT Revision: 917aca5b7885be20de00cd212741bceb4a92e272 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7173 --- kernel-binary.spec.in | 9 ++------- kernel-debug.changes | 13 +++++++++++++ kernel-debug.spec | 9 ++------- kernel-default.changes | 13 +++++++++++++ kernel-default.spec | 9 ++------- kernel-desktop.changes | 13 +++++++++++++ kernel-desktop.spec | 9 ++------- kernel-docs.changes | 13 +++++++++++++ kernel-docs.spec | 2 +- kernel-docs.spec.in | 2 +- kernel-ec2.changes | 13 +++++++++++++ kernel-ec2.spec | 9 ++------- kernel-imx51.changes | 13 +++++++++++++ kernel-imx51.spec | 9 ++------- kernel-omap2plus.changes | 13 +++++++++++++ kernel-omap2plus.spec | 9 ++------- kernel-pae.changes | 13 +++++++++++++ kernel-pae.spec | 9 ++------- kernel-ppc64.changes | 13 +++++++++++++ kernel-ppc64.spec | 9 ++------- kernel-s390.changes | 13 +++++++++++++ kernel-s390.spec | 9 ++------- kernel-source.changes | 13 +++++++++++++ kernel-source.spec | 4 +--- kernel-source.spec.in | 4 +--- kernel-syms.changes | 13 +++++++++++++ kernel-syms.spec | 2 +- kernel-syms.spec.in | 2 +- kernel-tegra.changes | 13 +++++++++++++ kernel-tegra.spec | 9 ++------- kernel-trace.changes | 13 +++++++++++++ kernel-trace.spec | 9 ++------- kernel-vanilla.changes | 13 +++++++++++++ kernel-vanilla.spec | 9 ++------- kernel-xen.changes | 13 +++++++++++++ kernel-xen.spec | 9 ++------- source-timestamp | 4 ++-- 37 files changed, 244 insertions(+), 110 deletions(-) diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index 17376990..bb0dce2e 100644 --- a/kernel-binary.spec.in +++ b/kernel-binary.spec.in @@ -58,7 +58,7 @@ Name: kernel-@FLAVOR@ Summary: @SUMMARY@ Version: @RPMVERSION@ Release: @RELEASE@ -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ BuildRequires: coreutils module-init-tools sparse @@ -689,12 +689,11 @@ rm %my_builddir/tmp %package base Summary: @SUMMARY@ - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name-base = %version-%release +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -726,7 +725,6 @@ This package contains only the base modules, required in all installs. %package extra Summary: @SUMMARY@ - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -767,7 +765,6 @@ This package contains additional modules not supported by Novell. %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -783,7 +780,6 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -819,7 +815,6 @@ kernel module packages) against the %build_flavor flavor of the kernel. %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo diff --git a/kernel-debug.changes b/kernel-debug.changes index 257327e0..b232e5d5 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Dec 7 11:08:09 CET 2011 - aj@suse.de + +- Use GPL-2.0 as license tag (from http://spdx.org/licenses/) + Only have one licenses line per file, the rest was just duplicated. +- commit 917aca5 + +------------------------------------------------------------------- +Wed Dec 7 11:05:05 CET 2011 - aj@suse.de + +- Fix typo: Base package should not conflict with itself but with main package. +- commit 5d0bf63 + ------------------------------------------------------------------- Tue Dec 6 00:07:03 CET 2011 - jeffm@suse.com diff --git a/kernel-debug.spec b/kernel-debug.spec index 1fec9967..0baa59b0 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -58,7 +58,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 3.2.rc4 Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ BuildRequires: coreutils module-init-tools sparse @@ -768,12 +768,11 @@ rm %my_builddir/tmp %package base Summary: A Debug Version of the Kernel - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name-base = %version-%release +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -806,7 +805,6 @@ This package contains only the base modules, required in all installs. %package extra Summary: A Debug Version of the Kernel - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -848,7 +846,6 @@ This package contains additional modules not supported by Novell. %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -864,7 +861,6 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -900,7 +896,6 @@ kernel module packages) against the %build_flavor flavor of the kernel. %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo diff --git a/kernel-default.changes b/kernel-default.changes index 257327e0..b232e5d5 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Dec 7 11:08:09 CET 2011 - aj@suse.de + +- Use GPL-2.0 as license tag (from http://spdx.org/licenses/) + Only have one licenses line per file, the rest was just duplicated. +- commit 917aca5 + +------------------------------------------------------------------- +Wed Dec 7 11:05:05 CET 2011 - aj@suse.de + +- Fix typo: Base package should not conflict with itself but with main package. +- commit 5d0bf63 + ------------------------------------------------------------------- Tue Dec 6 00:07:03 CET 2011 - jeffm@suse.com diff --git a/kernel-default.spec b/kernel-default.spec index a2426e30..fbe5eeb9 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -58,7 +58,7 @@ Name: kernel-default Summary: The Standard Kernel Version: 3.2.rc4 Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ BuildRequires: coreutils module-init-tools sparse @@ -783,12 +783,11 @@ rm %my_builddir/tmp %package base Summary: The Standard Kernel - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name-base = %version-%release +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -820,7 +819,6 @@ This package contains only the base modules, required in all installs. %package extra Summary: The Standard Kernel - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -861,7 +859,6 @@ This package contains additional modules not supported by Novell. %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -877,7 +874,6 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -913,7 +909,6 @@ kernel module packages) against the %build_flavor flavor of the kernel. %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo diff --git a/kernel-desktop.changes b/kernel-desktop.changes index 257327e0..b232e5d5 100644 --- a/kernel-desktop.changes +++ b/kernel-desktop.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Dec 7 11:08:09 CET 2011 - aj@suse.de + +- Use GPL-2.0 as license tag (from http://spdx.org/licenses/) + Only have one licenses line per file, the rest was just duplicated. +- commit 917aca5 + +------------------------------------------------------------------- +Wed Dec 7 11:05:05 CET 2011 - aj@suse.de + +- Fix typo: Base package should not conflict with itself but with main package. +- commit 5d0bf63 + ------------------------------------------------------------------- Tue Dec 6 00:07:03 CET 2011 - jeffm@suse.com diff --git a/kernel-desktop.spec b/kernel-desktop.spec index 0c005793..4330237e 100644 --- a/kernel-desktop.spec +++ b/kernel-desktop.spec @@ -58,7 +58,7 @@ Name: kernel-desktop Summary: Kernel optimized for the desktop Version: 3.2.rc4 Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ BuildRequires: coreutils module-init-tools sparse @@ -777,12 +777,11 @@ rm %my_builddir/tmp %package base Summary: Kernel optimized for the desktop - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name-base = %version-%release +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -827,7 +826,6 @@ This package contains only the base modules, required in all installs. %package extra Summary: Kernel optimized for the desktop - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -881,7 +879,6 @@ This package contains additional modules not supported by Novell. %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -897,7 +894,6 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -933,7 +929,6 @@ kernel module packages) against the %build_flavor flavor of the kernel. %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo diff --git a/kernel-docs.changes b/kernel-docs.changes index 257327e0..b232e5d5 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Dec 7 11:08:09 CET 2011 - aj@suse.de + +- Use GPL-2.0 as license tag (from http://spdx.org/licenses/) + Only have one licenses line per file, the rest was just duplicated. +- commit 917aca5 + +------------------------------------------------------------------- +Wed Dec 7 11:05:05 CET 2011 - aj@suse.de + +- Fix typo: Base package should not conflict with itself but with main package. +- commit 5d0bf63 + ------------------------------------------------------------------- Tue Dec 6 00:07:03 CET 2011 - jeffm@suse.com diff --git a/kernel-docs.spec b/kernel-docs.spec index 6a54739a..f646334a 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -29,7 +29,7 @@ Release: 0 BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: kernel-source%variant Url: http://www.kernel.org/ -License: GPL v2 or later +License: GPL-2.0 Group: Documentation/Man Provides: %name = %version-%source_rel BuildArch: noarch diff --git a/kernel-docs.spec.in b/kernel-docs.spec.in index 99d544d0..0b1c0f7d 100644 --- a/kernel-docs.spec.in +++ b/kernel-docs.spec.in @@ -29,7 +29,7 @@ Release: @RELEASE@ BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: kernel-source%variant Url: http://www.kernel.org/ -License: GPL v2 or later +License: GPL-2.0 Group: Documentation/Man Provides: %name = %version-%source_rel BuildArch: noarch diff --git a/kernel-ec2.changes b/kernel-ec2.changes index 257327e0..b232e5d5 100644 --- a/kernel-ec2.changes +++ b/kernel-ec2.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Dec 7 11:08:09 CET 2011 - aj@suse.de + +- Use GPL-2.0 as license tag (from http://spdx.org/licenses/) + Only have one licenses line per file, the rest was just duplicated. +- commit 917aca5 + +------------------------------------------------------------------- +Wed Dec 7 11:05:05 CET 2011 - aj@suse.de + +- Fix typo: Base package should not conflict with itself but with main package. +- commit 5d0bf63 + ------------------------------------------------------------------- Tue Dec 6 00:07:03 CET 2011 - jeffm@suse.com diff --git a/kernel-ec2.spec b/kernel-ec2.spec index 87a33119..b5d449b2 100644 --- a/kernel-ec2.spec +++ b/kernel-ec2.spec @@ -58,7 +58,7 @@ Name: kernel-ec2 Summary: The Amazon EC2 Xen Kernel Version: 3.2.rc4 Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ BuildRequires: coreutils module-init-tools sparse @@ -767,12 +767,11 @@ rm %my_builddir/tmp %package base Summary: The Amazon EC2 Xen Kernel - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name-base = %version-%release +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -807,7 +806,6 @@ This package contains only the base modules, required in all installs. %package extra Summary: The Amazon EC2 Xen Kernel - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -851,7 +849,6 @@ This package contains additional modules not supported by Novell. %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -867,7 +864,6 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -903,7 +899,6 @@ kernel module packages) against the %build_flavor flavor of the kernel. %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo diff --git a/kernel-imx51.changes b/kernel-imx51.changes index 257327e0..b232e5d5 100644 --- a/kernel-imx51.changes +++ b/kernel-imx51.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Dec 7 11:08:09 CET 2011 - aj@suse.de + +- Use GPL-2.0 as license tag (from http://spdx.org/licenses/) + Only have one licenses line per file, the rest was just duplicated. +- commit 917aca5 + +------------------------------------------------------------------- +Wed Dec 7 11:05:05 CET 2011 - aj@suse.de + +- Fix typo: Base package should not conflict with itself but with main package. +- commit 5d0bf63 + ------------------------------------------------------------------- Tue Dec 6 00:07:03 CET 2011 - jeffm@suse.com diff --git a/kernel-imx51.spec b/kernel-imx51.spec index 2ec7c9a2..aaf25217 100644 --- a/kernel-imx51.spec +++ b/kernel-imx51.spec @@ -58,7 +58,7 @@ Name: kernel-imx51 Summary: Kernel for Freescale's iMX SoC Version: 3.2.rc4 Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ BuildRequires: coreutils module-init-tools sparse @@ -765,12 +765,11 @@ rm %my_builddir/tmp %package base Summary: Kernel for Freescale's iMX SoC - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name-base = %version-%release +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -803,7 +802,6 @@ This package contains only the base modules, required in all installs. %package extra Summary: Kernel for Freescale's iMX SoC - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -845,7 +843,6 @@ This package contains additional modules not supported by Novell. %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -861,7 +858,6 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -897,7 +893,6 @@ kernel module packages) against the %build_flavor flavor of the kernel. %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo diff --git a/kernel-omap2plus.changes b/kernel-omap2plus.changes index 257327e0..b232e5d5 100644 --- a/kernel-omap2plus.changes +++ b/kernel-omap2plus.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Dec 7 11:08:09 CET 2011 - aj@suse.de + +- Use GPL-2.0 as license tag (from http://spdx.org/licenses/) + Only have one licenses line per file, the rest was just duplicated. +- commit 917aca5 + +------------------------------------------------------------------- +Wed Dec 7 11:05:05 CET 2011 - aj@suse.de + +- Fix typo: Base package should not conflict with itself but with main package. +- commit 5d0bf63 + ------------------------------------------------------------------- Tue Dec 6 00:07:03 CET 2011 - jeffm@suse.com diff --git a/kernel-omap2plus.spec b/kernel-omap2plus.spec index c2e69682..8a1209e6 100644 --- a/kernel-omap2plus.spec +++ b/kernel-omap2plus.spec @@ -58,7 +58,7 @@ Name: kernel-omap2plus Summary: Kernel for Texas instrument's OMAP SoC Version: 3.2.rc4 Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ BuildRequires: coreutils module-init-tools sparse @@ -765,12 +765,11 @@ rm %my_builddir/tmp %package base Summary: Kernel for Texas instrument's OMAP SoC - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name-base = %version-%release +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -803,7 +802,6 @@ This package contains only the base modules, required in all installs. %package extra Summary: Kernel for Texas instrument's OMAP SoC - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -845,7 +843,6 @@ This package contains additional modules not supported by Novell. %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -861,7 +858,6 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -897,7 +893,6 @@ kernel module packages) against the %build_flavor flavor of the kernel. %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo diff --git a/kernel-pae.changes b/kernel-pae.changes index 257327e0..b232e5d5 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Dec 7 11:08:09 CET 2011 - aj@suse.de + +- Use GPL-2.0 as license tag (from http://spdx.org/licenses/) + Only have one licenses line per file, the rest was just duplicated. +- commit 917aca5 + +------------------------------------------------------------------- +Wed Dec 7 11:05:05 CET 2011 - aj@suse.de + +- Fix typo: Base package should not conflict with itself but with main package. +- commit 5d0bf63 + ------------------------------------------------------------------- Tue Dec 6 00:07:03 CET 2011 - jeffm@suse.com diff --git a/kernel-pae.spec b/kernel-pae.spec index 25976f3f..1cddcbb5 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -58,7 +58,7 @@ Name: kernel-pae Summary: Kernel with PAE Support Version: 3.2.rc4 Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ BuildRequires: coreutils module-init-tools sparse @@ -774,12 +774,11 @@ rm %my_builddir/tmp %package base Summary: Kernel with PAE Support - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name-base = %version-%release +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -818,7 +817,6 @@ This package contains only the base modules, required in all installs. %package extra Summary: Kernel with PAE Support - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -866,7 +864,6 @@ This package contains additional modules not supported by Novell. %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -882,7 +879,6 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -918,7 +914,6 @@ kernel module packages) against the %build_flavor flavor of the kernel. %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo diff --git a/kernel-ppc64.changes b/kernel-ppc64.changes index 257327e0..b232e5d5 100644 --- a/kernel-ppc64.changes +++ b/kernel-ppc64.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Dec 7 11:08:09 CET 2011 - aj@suse.de + +- Use GPL-2.0 as license tag (from http://spdx.org/licenses/) + Only have one licenses line per file, the rest was just duplicated. +- commit 917aca5 + +------------------------------------------------------------------- +Wed Dec 7 11:05:05 CET 2011 - aj@suse.de + +- Fix typo: Base package should not conflict with itself but with main package. +- commit 5d0bf63 + ------------------------------------------------------------------- Tue Dec 6 00:07:03 CET 2011 - jeffm@suse.com diff --git a/kernel-ppc64.spec b/kernel-ppc64.spec index 2f3ee1b6..a417491f 100644 --- a/kernel-ppc64.spec +++ b/kernel-ppc64.spec @@ -58,7 +58,7 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems Version: 3.2.rc4 Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ BuildRequires: coreutils module-init-tools sparse @@ -778,12 +778,11 @@ rm %my_builddir/tmp %package base Summary: Kernel for ppc64 Systems - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name-base = %version-%release +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -822,7 +821,6 @@ This package contains only the base modules, required in all installs. %package extra Summary: Kernel for ppc64 Systems - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -870,7 +868,6 @@ This package contains additional modules not supported by Novell. %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -886,7 +883,6 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -922,7 +918,6 @@ kernel module packages) against the %build_flavor flavor of the kernel. %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo diff --git a/kernel-s390.changes b/kernel-s390.changes index 257327e0..b232e5d5 100644 --- a/kernel-s390.changes +++ b/kernel-s390.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Dec 7 11:08:09 CET 2011 - aj@suse.de + +- Use GPL-2.0 as license tag (from http://spdx.org/licenses/) + Only have one licenses line per file, the rest was just duplicated. +- commit 917aca5 + +------------------------------------------------------------------- +Wed Dec 7 11:05:05 CET 2011 - aj@suse.de + +- Fix typo: Base package should not conflict with itself but with main package. +- commit 5d0bf63 + ------------------------------------------------------------------- Tue Dec 6 00:07:03 CET 2011 - jeffm@suse.com diff --git a/kernel-s390.spec b/kernel-s390.spec index 87d24b9d..b9a85762 100644 --- a/kernel-s390.spec +++ b/kernel-s390.spec @@ -58,7 +58,7 @@ Name: kernel-s390 Summary: The Standard Kernel Version: 3.2.rc4 Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ BuildRequires: coreutils module-init-tools sparse @@ -767,12 +767,11 @@ rm %my_builddir/tmp %package base Summary: The Standard Kernel - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name-base = %version-%release +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -804,7 +803,6 @@ This package contains only the base modules, required in all installs. %package extra Summary: The Standard Kernel - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -845,7 +843,6 @@ This package contains additional modules not supported by Novell. %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -861,7 +858,6 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -897,7 +893,6 @@ kernel module packages) against the %build_flavor flavor of the kernel. %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo diff --git a/kernel-source.changes b/kernel-source.changes index 257327e0..b232e5d5 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Dec 7 11:08:09 CET 2011 - aj@suse.de + +- Use GPL-2.0 as license tag (from http://spdx.org/licenses/) + Only have one licenses line per file, the rest was just duplicated. +- commit 917aca5 + +------------------------------------------------------------------- +Wed Dec 7 11:05:05 CET 2011 - aj@suse.de + +- Fix typo: Base package should not conflict with itself but with main package. +- commit 5d0bf63 + ------------------------------------------------------------------- Tue Dec 6 00:07:03 CET 2011 - jeffm@suse.com diff --git a/kernel-source.spec b/kernel-source.spec index fa77f1e8..7bd23762 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -31,7 +31,7 @@ Name: kernel-source Summary: The Linux Kernel Sources Version: 3.2.rc4 Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: Development/Sources Url: http://www.kernel.org/ AutoReqProv: off @@ -120,7 +120,6 @@ Linux kernel sources with many fixes and improvements. %source_timestamp %package -n kernel-devel%variant Summary: Development files needed for building kernel modules -License: GPL v2 only Group: Development/Sources AutoReqProv: off Provides: multiversion(kernel) @@ -134,7 +133,6 @@ external kernel modules. %source_timestamp %package vanilla Summary: Vanilla Linux kernel sources with minor build fixes. -License: GPL v2 only Group: Development/Sources AutoReqProv: off Provides: multiversion(kernel) diff --git a/kernel-source.spec.in b/kernel-source.spec.in index e353eec3..3a596bc8 100644 --- a/kernel-source.spec.in +++ b/kernel-source.spec.in @@ -31,7 +31,7 @@ Name: kernel-source@VARIANT@ Summary: The Linux Kernel Sources Version: @RPMVERSION@ Release: @RELEASE@ -License: GPL v2 only +License: GPL-2.0 Group: Development/Sources Url: http://www.kernel.org/ AutoReqProv: off @@ -120,7 +120,6 @@ Linux kernel sources with many fixes and improvements. %source_timestamp %package -n kernel-devel%variant Summary: Development files needed for building kernel modules -License: GPL v2 only Group: Development/Sources AutoReqProv: off Provides: multiversion(kernel) @@ -134,7 +133,6 @@ external kernel modules. %source_timestamp %package vanilla Summary: Vanilla Linux kernel sources with minor build fixes. -License: GPL v2 only Group: Development/Sources AutoReqProv: off Provides: multiversion(kernel) diff --git a/kernel-syms.changes b/kernel-syms.changes index 257327e0..b232e5d5 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Dec 7 11:08:09 CET 2011 - aj@suse.de + +- Use GPL-2.0 as license tag (from http://spdx.org/licenses/) + Only have one licenses line per file, the rest was just duplicated. +- commit 917aca5 + +------------------------------------------------------------------- +Wed Dec 7 11:05:05 CET 2011 - aj@suse.de + +- Fix typo: Base package should not conflict with itself but with main package. +- commit 5d0bf63 + ------------------------------------------------------------------- Tue Dec 6 00:07:03 CET 2011 - jeffm@suse.com diff --git a/kernel-syms.spec b/kernel-syms.spec index a30abf0f..570cb30d 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -30,7 +30,7 @@ Release: 0 %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) Release: %kernel_source_release %endif -License: GPL v2 only +License: GPL-2.0 Group: Development/Sources Url: http://www.kernel.org/ AutoReqProv: off diff --git a/kernel-syms.spec.in b/kernel-syms.spec.in index 98f38bd2..1872d75f 100644 --- a/kernel-syms.spec.in +++ b/kernel-syms.spec.in @@ -30,7 +30,7 @@ Release: @RELEASE@ %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) Release: %kernel_source_release %endif -License: GPL v2 only +License: GPL-2.0 Group: Development/Sources Url: http://www.kernel.org/ AutoReqProv: off diff --git a/kernel-tegra.changes b/kernel-tegra.changes index 257327e0..b232e5d5 100644 --- a/kernel-tegra.changes +++ b/kernel-tegra.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Dec 7 11:08:09 CET 2011 - aj@suse.de + +- Use GPL-2.0 as license tag (from http://spdx.org/licenses/) + Only have one licenses line per file, the rest was just duplicated. +- commit 917aca5 + +------------------------------------------------------------------- +Wed Dec 7 11:05:05 CET 2011 - aj@suse.de + +- Fix typo: Base package should not conflict with itself but with main package. +- commit 5d0bf63 + ------------------------------------------------------------------- Tue Dec 6 00:07:03 CET 2011 - jeffm@suse.com diff --git a/kernel-tegra.spec b/kernel-tegra.spec index a6794494..f36a3e6e 100644 --- a/kernel-tegra.spec +++ b/kernel-tegra.spec @@ -58,7 +58,7 @@ Name: kernel-tegra Summary: Kernel for Nvidia's Tegra SoC Version: 3.2.rc4 Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ BuildRequires: coreutils module-init-tools sparse @@ -765,12 +765,11 @@ rm %my_builddir/tmp %package base Summary: Kernel for Nvidia's Tegra SoC - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name-base = %version-%release +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -803,7 +802,6 @@ This package contains only the base modules, required in all installs. %package extra Summary: Kernel for Nvidia's Tegra SoC - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -845,7 +843,6 @@ This package contains additional modules not supported by Novell. %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -861,7 +858,6 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -897,7 +893,6 @@ kernel module packages) against the %build_flavor flavor of the kernel. %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo diff --git a/kernel-trace.changes b/kernel-trace.changes index 257327e0..b232e5d5 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Dec 7 11:08:09 CET 2011 - aj@suse.de + +- Use GPL-2.0 as license tag (from http://spdx.org/licenses/) + Only have one licenses line per file, the rest was just duplicated. +- commit 917aca5 + +------------------------------------------------------------------- +Wed Dec 7 11:05:05 CET 2011 - aj@suse.de + +- Fix typo: Base package should not conflict with itself but with main package. +- commit 5d0bf63 + ------------------------------------------------------------------- Tue Dec 6 00:07:03 CET 2011 - jeffm@suse.com diff --git a/kernel-trace.spec b/kernel-trace.spec index 0e5e33b4..b54e4210 100644 --- a/kernel-trace.spec +++ b/kernel-trace.spec @@ -58,7 +58,7 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features Version: 3.2.rc4 Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ BuildRequires: coreutils module-init-tools sparse @@ -775,12 +775,11 @@ rm %my_builddir/tmp %package base Summary: The Standard Kernel with Tracing Features - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name-base = %version-%release +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -812,7 +811,6 @@ This package contains only the base modules, required in all installs. %package extra Summary: The Standard Kernel with Tracing Features - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -853,7 +851,6 @@ This package contains additional modules not supported by Novell. %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -869,7 +866,6 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -905,7 +901,6 @@ kernel module packages) against the %build_flavor flavor of the kernel. %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 257327e0..b232e5d5 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Dec 7 11:08:09 CET 2011 - aj@suse.de + +- Use GPL-2.0 as license tag (from http://spdx.org/licenses/) + Only have one licenses line per file, the rest was just duplicated. +- commit 917aca5 + +------------------------------------------------------------------- +Wed Dec 7 11:05:05 CET 2011 - aj@suse.de + +- Fix typo: Base package should not conflict with itself but with main package. +- commit 5d0bf63 + ------------------------------------------------------------------- Tue Dec 6 00:07:03 CET 2011 - jeffm@suse.com diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index a2d3abfe..400db200 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -58,7 +58,7 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches Version: 3.2.rc4 Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ BuildRequires: coreutils module-init-tools sparse @@ -771,12 +771,11 @@ rm %my_builddir/tmp %package base Summary: The Standard Kernel - without any SUSE patches - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name-base = %version-%release +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -808,7 +807,6 @@ This package contains only the base modules, required in all installs. %package extra Summary: The Standard Kernel - without any SUSE patches - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -849,7 +847,6 @@ This package contains additional modules not supported by Novell. %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -865,7 +862,6 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -901,7 +897,6 @@ kernel module packages) against the %build_flavor flavor of the kernel. %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo diff --git a/kernel-xen.changes b/kernel-xen.changes index 257327e0..b232e5d5 100644 --- a/kernel-xen.changes +++ b/kernel-xen.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Dec 7 11:08:09 CET 2011 - aj@suse.de + +- Use GPL-2.0 as license tag (from http://spdx.org/licenses/) + Only have one licenses line per file, the rest was just duplicated. +- commit 917aca5 + +------------------------------------------------------------------- +Wed Dec 7 11:05:05 CET 2011 - aj@suse.de + +- Fix typo: Base package should not conflict with itself but with main package. +- commit 5d0bf63 + ------------------------------------------------------------------- Tue Dec 6 00:07:03 CET 2011 - jeffm@suse.com diff --git a/kernel-xen.spec b/kernel-xen.spec index bbe3268a..167a9fcd 100644 --- a/kernel-xen.spec +++ b/kernel-xen.spec @@ -58,7 +58,7 @@ Name: kernel-xen Summary: The Xen Kernel Version: 3.2.rc4 Release: 0 -License: GPL v2 only +License: GPL-2.0 Group: System/Kernel Url: http://www.kernel.org/ BuildRequires: coreutils module-init-tools sparse @@ -767,12 +767,11 @@ rm %my_builddir/tmp %package base Summary: The Xen Kernel - base modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel -Conflicts: %name-base = %version-%release +Conflicts: %name = %version-%release Requires(pre): coreutils awk Requires(post): module-init-tools Requires(post): perl-Bootloader @@ -807,7 +806,6 @@ This package contains only the base modules, required in all installs. %package extra Summary: The Xen Kernel - Unsupported kernel modules -License: GPL v2 only Group: System/Kernel Url: http://www.kernel.org/ Provides: multiversion(kernel) @@ -851,7 +849,6 @@ This package contains additional modules not supported by Novell. %package man Summary: The collection of man pages generated by the kmsg script. -License: GPL v2 only Group: System/Kernel %description man @@ -867,7 +864,6 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules -License: GPL v2 only Group: Development/Sources Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel @@ -903,7 +899,6 @@ kernel module packages) against the %build_flavor flavor of the kernel. %package devel-debuginfo # rpm doesn't notice that vmlinux.debug belongs to the gzipped vmlinux.gz Summary: Debug information for package %name-devel -License: GPL v2 only Group: Development/Debug %description devel-debuginfo diff --git a/source-timestamp b/source-timestamp index 8968878e..6e3df7f6 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2011-12-06 00:07:03 +0100 -GIT Revision: a7d546d8a12aa38a2627dceb78470a76525fb34d +2011-12-07 11:08:09 +0100 +GIT Revision: 917aca5b7885be20de00cd212741bceb4a92e272 GIT Branch: master