diff --git a/kernel-binary.spec.in b/kernel-binary.spec.in index e5875f7e..c886acd4 100644 --- a/kernel-binary.spec.in +++ b/kernel-binary.spec.in @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild + # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild @@ -59,22 +59,25 @@ Name: kernel-@FLAVOR@ Summary: @SUMMARY@ +License: GPL-2.0 +Group: System/Kernel Version: @RPMVERSION@ %if 0%{?is_kotd} Release: .g@COMMIT@ %else Release: @RELEASE@ %endif -License: GPL-2.0 -Group: System/Kernel Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse bc +BuildRequires: bc +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse # Used to sign the kernel in the buildservice BuildRequires: pesign-obs-integration -Provides: multiversion(kernel) -Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel +Provides: %{name}_%_target_cpu = %version-%release +Provides: multiversion(kernel) %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase @@ -125,7 +128,7 @@ BuildRequires: u-boot-tools #!BuildIgnore: xen %endif -Obsoletes: microcode_ctl +Obsoletes: microcode_ctl %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions @@ -189,27 +192,27 @@ Provides: %1-kmp-%build_flavor = %2 # 11.1 %obsolete_kmp quickcam 0.6.7 # sle11-sp1 -%obsolete_kmp wacom 0.8.1_3 -%obsolete_kmp btrfs 0_3 -%obsolete_kmp brocade-bna 2.1.0.0_3 -%obsolete_kmp hyper-v 0_3 -%obsolete_kmp intel-e1000e 2.2.14 -%obsolete_kmp drm 3.7_3.1 -Obsoletes: firewire <= 3.0 -Provides: firewire = 3.0 -%obsolete_kmp firewire 3.0 -%obsolete_kmp iwlagn 3.0 -Obsoletes: compat-ath9k <= 3.0 -Provides: compat-ath9k = 3.0 -%obsolete_kmp compat-ath9k 3.0 -%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 -%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 -%obsolete_kmp rt3090 2.4.0.4_3 -%obsolete_kmp rt3592 2.4.1.1_3 -%obsolete_kmp rt5390 2.4.0.4_3 -%obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -808,11 +811,11 @@ rm %my_builddir/tmp Summary: @SUMMARY@ - base modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Provides: multiversion(kernel) Conflicts: %name = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd @PROVIDES_OBSOLETES_BASE@ @@ -845,12 +848,12 @@ This package contains only the base modules, required in all installs. Summary: @SUMMARY@ - Unsupported kernel modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: %name-extra_%_target_cpu = %version-%release Provides: kernel-extra = %version-%source_rel +Provides: multiversion(kernel) Requires: %{name}_%_target_cpu = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu) @@ -899,8 +902,8 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules Group: Development/Sources -Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel +Provides: multiversion(kernel) Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) PreReq: coreutils diff --git a/kernel-debug.changes b/kernel-debug.changes index c280ba61..c4c269de 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,9 +1,27 @@ +------------------------------------------------------------------- +Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Require 'modutils' also in the subpackages +- commit 91f0a2e + +------------------------------------------------------------------- +Thu Jan 30 18:16:52 CET 2014 - mmarek@suse.cz + +- Reformat the spec files to what the buildservice expects +- commit 0b9e9a1 + ------------------------------------------------------------------- Wed Jan 29 17:04:23 CET 2014 - jslaby@suse.cz - Linux 3.13.1. - commit 01e2360 +------------------------------------------------------------------- +Mon Jan 27 10:20:14 CET 2014 - mmarek@suse.cz + +- Drop the _constraints file, we are using the prjconf setting for now +- commit a0aa890 + ------------------------------------------------------------------- Fri Jan 24 16:41:02 CET 2014 - jbeulich@suse.com diff --git a/kernel-debug.spec b/kernel-debug.spec index 1e8075a6..0a68c9b9 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild + # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild @@ -59,22 +59,25 @@ Name: kernel-debug Summary: A Debug Version of the Kernel +License: GPL-2.0 +Group: System/Kernel Version: 3.13.1 %if 0%{?is_kotd} -Release: .g01e2360 +Release: .g62e9557 %else Release: 0 %endif -License: GPL-2.0 -Group: System/Kernel Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse bc +BuildRequires: bc +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse # Used to sign the kernel in the buildservice BuildRequires: pesign-obs-integration -Provides: multiversion(kernel) -Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel +Provides: %{name}_%_target_cpu = %version-%release +Provides: multiversion(kernel) %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase @@ -125,7 +128,7 @@ BuildRequires: u-boot-tools #!BuildIgnore: xen %endif -Obsoletes: microcode_ctl +Obsoletes: microcode_ctl %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions @@ -148,11 +151,9 @@ Provides: kernel = %version-%source_rel Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 %endif - Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc -Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -268,27 +269,27 @@ Provides: %1-kmp-%build_flavor = %2 # 11.1 %obsolete_kmp quickcam 0.6.7 # sle11-sp1 -%obsolete_kmp wacom 0.8.1_3 -%obsolete_kmp btrfs 0_3 -%obsolete_kmp brocade-bna 2.1.0.0_3 -%obsolete_kmp hyper-v 0_3 -%obsolete_kmp intel-e1000e 2.2.14 -%obsolete_kmp drm 3.7_3.1 -Obsoletes: firewire <= 3.0 -Provides: firewire = 3.0 -%obsolete_kmp firewire 3.0 -%obsolete_kmp iwlagn 3.0 -Obsoletes: compat-ath9k <= 3.0 -Provides: compat-ath9k = 3.0 -%obsolete_kmp compat-ath9k 3.0 -%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 -%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 -%obsolete_kmp rt3090 2.4.0.4_3 -%obsolete_kmp rt3592 2.4.1.1_3 -%obsolete_kmp rt5390 2.4.0.4_3 -%obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -888,11 +889,11 @@ rm %my_builddir/tmp Summary: A Debug Version of the Kernel - base modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Provides: multiversion(kernel) Conflicts: %name = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd @@ -926,12 +927,12 @@ This package contains only the base modules, required in all installs. Summary: A Debug Version of the Kernel - Unsupported kernel modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: %name-extra_%_target_cpu = %version-%release Provides: kernel-extra = %version-%source_rel +Provides: multiversion(kernel) Requires: %{name}_%_target_cpu = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu) @@ -981,8 +982,8 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules Group: Development/Sources -Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel +Provides: multiversion(kernel) Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) PreReq: coreutils diff --git a/kernel-default.changes b/kernel-default.changes index c280ba61..c4c269de 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,9 +1,27 @@ +------------------------------------------------------------------- +Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Require 'modutils' also in the subpackages +- commit 91f0a2e + +------------------------------------------------------------------- +Thu Jan 30 18:16:52 CET 2014 - mmarek@suse.cz + +- Reformat the spec files to what the buildservice expects +- commit 0b9e9a1 + ------------------------------------------------------------------- Wed Jan 29 17:04:23 CET 2014 - jslaby@suse.cz - Linux 3.13.1. - commit 01e2360 +------------------------------------------------------------------- +Mon Jan 27 10:20:14 CET 2014 - mmarek@suse.cz + +- Drop the _constraints file, we are using the prjconf setting for now +- commit a0aa890 + ------------------------------------------------------------------- Fri Jan 24 16:41:02 CET 2014 - jbeulich@suse.com diff --git a/kernel-default.spec b/kernel-default.spec index ef1c87f0..18554017 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild + # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild @@ -59,22 +59,25 @@ Name: kernel-default Summary: The Standard Kernel +License: GPL-2.0 +Group: System/Kernel Version: 3.13.1 %if 0%{?is_kotd} -Release: .g01e2360 +Release: .g62e9557 %else Release: 0 %endif -License: GPL-2.0 -Group: System/Kernel Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse bc +BuildRequires: bc +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse # Used to sign the kernel in the buildservice BuildRequires: pesign-obs-integration -Provides: multiversion(kernel) -Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel +Provides: %{name}_%_target_cpu = %version-%release +Provides: multiversion(kernel) %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase @@ -125,7 +128,7 @@ BuildRequires: u-boot-tools #!BuildIgnore: xen %endif -Obsoletes: microcode_ctl +Obsoletes: microcode_ctl %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions @@ -160,11 +163,9 @@ Obsoletes: kernel-kdump <= 2.6.28 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 %endif - Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc -Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -280,27 +281,27 @@ Provides: %1-kmp-%build_flavor = %2 # 11.1 %obsolete_kmp quickcam 0.6.7 # sle11-sp1 -%obsolete_kmp wacom 0.8.1_3 -%obsolete_kmp btrfs 0_3 -%obsolete_kmp brocade-bna 2.1.0.0_3 -%obsolete_kmp hyper-v 0_3 -%obsolete_kmp intel-e1000e 2.2.14 -%obsolete_kmp drm 3.7_3.1 -Obsoletes: firewire <= 3.0 -Provides: firewire = 3.0 -%obsolete_kmp firewire 3.0 -%obsolete_kmp iwlagn 3.0 -Obsoletes: compat-ath9k <= 3.0 -Provides: compat-ath9k = 3.0 -%obsolete_kmp compat-ath9k 3.0 -%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 -%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 -%obsolete_kmp rt3090 2.4.0.4_3 -%obsolete_kmp rt3592 2.4.1.1_3 -%obsolete_kmp rt5390 2.4.0.4_3 -%obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -899,11 +900,11 @@ rm %my_builddir/tmp Summary: The Standard Kernel - base modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Provides: multiversion(kernel) Conflicts: %name = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd @@ -936,12 +937,12 @@ This package contains only the base modules, required in all installs. Summary: The Standard Kernel - Unsupported kernel modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: %name-extra_%_target_cpu = %version-%release Provides: kernel-extra = %version-%source_rel +Provides: multiversion(kernel) Requires: %{name}_%_target_cpu = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu) @@ -990,8 +991,8 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules Group: Development/Sources -Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel +Provides: multiversion(kernel) Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) PreReq: coreutils diff --git a/kernel-desktop.changes b/kernel-desktop.changes index c280ba61..c4c269de 100644 --- a/kernel-desktop.changes +++ b/kernel-desktop.changes @@ -1,9 +1,27 @@ +------------------------------------------------------------------- +Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Require 'modutils' also in the subpackages +- commit 91f0a2e + +------------------------------------------------------------------- +Thu Jan 30 18:16:52 CET 2014 - mmarek@suse.cz + +- Reformat the spec files to what the buildservice expects +- commit 0b9e9a1 + ------------------------------------------------------------------- Wed Jan 29 17:04:23 CET 2014 - jslaby@suse.cz - Linux 3.13.1. - commit 01e2360 +------------------------------------------------------------------- +Mon Jan 27 10:20:14 CET 2014 - mmarek@suse.cz + +- Drop the _constraints file, we are using the prjconf setting for now +- commit a0aa890 + ------------------------------------------------------------------- Fri Jan 24 16:41:02 CET 2014 - jbeulich@suse.com diff --git a/kernel-desktop.spec b/kernel-desktop.spec index 38a4e8cb..baaebbc0 100644 --- a/kernel-desktop.spec +++ b/kernel-desktop.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild + # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild @@ -59,22 +59,25 @@ Name: kernel-desktop Summary: Kernel optimized for the desktop +License: GPL-2.0 +Group: System/Kernel Version: 3.13.1 %if 0%{?is_kotd} -Release: .g01e2360 +Release: .g62e9557 %else Release: 0 %endif -License: GPL-2.0 -Group: System/Kernel Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse bc +BuildRequires: bc +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse # Used to sign the kernel in the buildservice BuildRequires: pesign-obs-integration -Provides: multiversion(kernel) -Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel +Provides: %{name}_%_target_cpu = %version-%release +Provides: multiversion(kernel) %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase @@ -125,7 +128,7 @@ BuildRequires: u-boot-tools #!BuildIgnore: xen %endif -Obsoletes: microcode_ctl +Obsoletes: microcode_ctl %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions @@ -145,11 +148,9 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel - Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc -Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -265,27 +266,27 @@ Provides: %1-kmp-%build_flavor = %2 # 11.1 %obsolete_kmp quickcam 0.6.7 # sle11-sp1 -%obsolete_kmp wacom 0.8.1_3 -%obsolete_kmp btrfs 0_3 -%obsolete_kmp brocade-bna 2.1.0.0_3 -%obsolete_kmp hyper-v 0_3 -%obsolete_kmp intel-e1000e 2.2.14 -%obsolete_kmp drm 3.7_3.1 -Obsoletes: firewire <= 3.0 -Provides: firewire = 3.0 -%obsolete_kmp firewire 3.0 -%obsolete_kmp iwlagn 3.0 -Obsoletes: compat-ath9k <= 3.0 -Provides: compat-ath9k = 3.0 -%obsolete_kmp compat-ath9k 3.0 -%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 -%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 -%obsolete_kmp rt3090 2.4.0.4_3 -%obsolete_kmp rt3592 2.4.1.1_3 -%obsolete_kmp rt5390 2.4.0.4_3 -%obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -897,11 +898,11 @@ rm %my_builddir/tmp Summary: Kernel optimized for the desktop - base modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Provides: multiversion(kernel) Conflicts: %name = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd @@ -947,12 +948,12 @@ This package contains only the base modules, required in all installs. Summary: Kernel optimized for the desktop - Unsupported kernel modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: %name-extra_%_target_cpu = %version-%release Provides: kernel-extra = %version-%source_rel +Provides: multiversion(kernel) Requires: %{name}_%_target_cpu = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu) @@ -1014,8 +1015,8 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules Group: Development/Sources -Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel +Provides: multiversion(kernel) Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) PreReq: coreutils diff --git a/kernel-docs.changes b/kernel-docs.changes index c280ba61..c4c269de 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,9 +1,27 @@ +------------------------------------------------------------------- +Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Require 'modutils' also in the subpackages +- commit 91f0a2e + +------------------------------------------------------------------- +Thu Jan 30 18:16:52 CET 2014 - mmarek@suse.cz + +- Reformat the spec files to what the buildservice expects +- commit 0b9e9a1 + ------------------------------------------------------------------- Wed Jan 29 17:04:23 CET 2014 - jslaby@suse.cz - Linux 3.13.1. - commit 01e2360 +------------------------------------------------------------------- +Mon Jan 27 10:20:14 CET 2014 - mmarek@suse.cz + +- Drop the _constraints file, we are using the prjconf setting for now +- commit a0aa890 + ------------------------------------------------------------------- Fri Jan 24 16:41:02 CET 2014 - jbeulich@suse.com diff --git a/kernel-docs.spec b/kernel-docs.spec index d1c206ed..79c3db92 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define patchversion 3.13.1 %define variant %{nil} @@ -24,17 +23,24 @@ Name: kernel-docs Summary: Kernel Documentation +License: GPL-2.0 +Group: Documentation/Man Version: 3.13.1 %if 0%{?is_kotd} -Release: .g01e2360 +Release: .g62e9557 %else Release: 0 %endif -BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel +BuildRequires: docbook-toys +BuildRequires: docbook-utils +BuildRequires: ghostscript_any BuildRequires: kernel-source%variant +BuildRequires: libjpeg-devel +BuildRequires: texlive +BuildRequires: transfig +BuildRequires: xmlto +BuildRequires: xorg-x11-devel Url: http://www.kernel.org/ -License: GPL-2.0 -Group: Documentation/Man Provides: %name = %version-%source_rel BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/kernel-docs.spec.in b/kernel-docs.spec.in index a8ee3668..2fc1f750 100644 --- a/kernel-docs.spec.in +++ b/kernel-docs.spec.in @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define patchversion @PATCHVERSION@ %define variant @VARIANT@%{nil} @@ -24,17 +23,24 @@ Name: kernel-docs@VARIANT@ Summary: Kernel Documentation +License: GPL-2.0 +Group: Documentation/Man Version: @RPMVERSION@ %if 0%{?is_kotd} Release: .g@COMMIT@ %else Release: @RELEASE@ %endif -BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel +BuildRequires: docbook-toys +BuildRequires: docbook-utils +BuildRequires: ghostscript_any BuildRequires: kernel-source%variant +BuildRequires: libjpeg-devel +BuildRequires: texlive +BuildRequires: transfig +BuildRequires: xmlto +BuildRequires: xorg-x11-devel Url: http://www.kernel.org/ -License: GPL-2.0 -Group: Documentation/Man Provides: %name = %version-%source_rel BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/kernel-ec2.changes b/kernel-ec2.changes index c280ba61..c4c269de 100644 --- a/kernel-ec2.changes +++ b/kernel-ec2.changes @@ -1,9 +1,27 @@ +------------------------------------------------------------------- +Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Require 'modutils' also in the subpackages +- commit 91f0a2e + +------------------------------------------------------------------- +Thu Jan 30 18:16:52 CET 2014 - mmarek@suse.cz + +- Reformat the spec files to what the buildservice expects +- commit 0b9e9a1 + ------------------------------------------------------------------- Wed Jan 29 17:04:23 CET 2014 - jslaby@suse.cz - Linux 3.13.1. - commit 01e2360 +------------------------------------------------------------------- +Mon Jan 27 10:20:14 CET 2014 - mmarek@suse.cz + +- Drop the _constraints file, we are using the prjconf setting for now +- commit a0aa890 + ------------------------------------------------------------------- Fri Jan 24 16:41:02 CET 2014 - jbeulich@suse.com diff --git a/kernel-ec2.spec b/kernel-ec2.spec index a07c6aad..059faf9f 100644 --- a/kernel-ec2.spec +++ b/kernel-ec2.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild + # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild @@ -59,22 +59,25 @@ Name: kernel-ec2 Summary: The Amazon EC2 Xen Kernel +License: GPL-2.0 +Group: System/Kernel Version: 3.13.1 %if 0%{?is_kotd} -Release: .g01e2360 +Release: .g62e9557 %else Release: 0 %endif -License: GPL-2.0 -Group: System/Kernel Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse bc +BuildRequires: bc +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse # Used to sign the kernel in the buildservice BuildRequires: pesign-obs-integration -Provides: multiversion(kernel) -Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel +Provides: %{name}_%_target_cpu = %version-%release +Provides: multiversion(kernel) %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase @@ -125,7 +128,7 @@ BuildRequires: u-boot-tools #!BuildIgnore: xen %endif -Obsoletes: microcode_ctl +Obsoletes: microcode_ctl %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions @@ -145,11 +148,9 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel - Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc -Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -265,27 +266,27 @@ Provides: %1-kmp-%build_flavor = %2 # 11.1 %obsolete_kmp quickcam 0.6.7 # sle11-sp1 -%obsolete_kmp wacom 0.8.1_3 -%obsolete_kmp btrfs 0_3 -%obsolete_kmp brocade-bna 2.1.0.0_3 -%obsolete_kmp hyper-v 0_3 -%obsolete_kmp intel-e1000e 2.2.14 -%obsolete_kmp drm 3.7_3.1 -Obsoletes: firewire <= 3.0 -Provides: firewire = 3.0 -%obsolete_kmp firewire 3.0 -%obsolete_kmp iwlagn 3.0 -Obsoletes: compat-ath9k <= 3.0 -Provides: compat-ath9k = 3.0 -%obsolete_kmp compat-ath9k 3.0 -%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 -%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 -%obsolete_kmp rt3090 2.4.0.4_3 -%obsolete_kmp rt3592 2.4.1.1_3 -%obsolete_kmp rt5390 2.4.0.4_3 -%obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -887,11 +888,11 @@ rm %my_builddir/tmp Summary: The Amazon EC2 Xen Kernel - base modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Provides: multiversion(kernel) Conflicts: %name = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd @@ -927,12 +928,12 @@ This package contains only the base modules, required in all installs. Summary: The Amazon EC2 Xen Kernel - Unsupported kernel modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: %name-extra_%_target_cpu = %version-%release Provides: kernel-extra = %version-%source_rel +Provides: multiversion(kernel) Requires: %{name}_%_target_cpu = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu) @@ -984,8 +985,8 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules Group: Development/Sources -Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel +Provides: multiversion(kernel) Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) PreReq: coreutils diff --git a/kernel-exynos.changes b/kernel-exynos.changes index c280ba61..c4c269de 100644 --- a/kernel-exynos.changes +++ b/kernel-exynos.changes @@ -1,9 +1,27 @@ +------------------------------------------------------------------- +Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Require 'modutils' also in the subpackages +- commit 91f0a2e + +------------------------------------------------------------------- +Thu Jan 30 18:16:52 CET 2014 - mmarek@suse.cz + +- Reformat the spec files to what the buildservice expects +- commit 0b9e9a1 + ------------------------------------------------------------------- Wed Jan 29 17:04:23 CET 2014 - jslaby@suse.cz - Linux 3.13.1. - commit 01e2360 +------------------------------------------------------------------- +Mon Jan 27 10:20:14 CET 2014 - mmarek@suse.cz + +- Drop the _constraints file, we are using the prjconf setting for now +- commit a0aa890 + ------------------------------------------------------------------- Fri Jan 24 16:41:02 CET 2014 - jbeulich@suse.com diff --git a/kernel-exynos.spec b/kernel-exynos.spec index 7ccf3e32..6e764c52 100644 --- a/kernel-exynos.spec +++ b/kernel-exynos.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild + # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild @@ -59,22 +59,25 @@ Name: kernel-exynos Summary: Kernel for Samsung's Exynos SoC +License: GPL-2.0 +Group: System/Kernel Version: 3.13.1 %if 0%{?is_kotd} -Release: .g01e2360 +Release: .g62e9557 %else Release: 0 %endif -License: GPL-2.0 -Group: System/Kernel Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse bc +BuildRequires: bc +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse # Used to sign the kernel in the buildservice BuildRequires: pesign-obs-integration -Provides: multiversion(kernel) -Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel +Provides: %{name}_%_target_cpu = %version-%release +Provides: multiversion(kernel) %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase @@ -125,7 +128,7 @@ BuildRequires: u-boot-tools #!BuildIgnore: xen %endif -Obsoletes: microcode_ctl +Obsoletes: microcode_ctl %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions @@ -145,11 +148,9 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel - Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc -Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -265,27 +266,27 @@ Provides: %1-kmp-%build_flavor = %2 # 11.1 %obsolete_kmp quickcam 0.6.7 # sle11-sp1 -%obsolete_kmp wacom 0.8.1_3 -%obsolete_kmp btrfs 0_3 -%obsolete_kmp brocade-bna 2.1.0.0_3 -%obsolete_kmp hyper-v 0_3 -%obsolete_kmp intel-e1000e 2.2.14 -%obsolete_kmp drm 3.7_3.1 -Obsoletes: firewire <= 3.0 -Provides: firewire = 3.0 -%obsolete_kmp firewire 3.0 -%obsolete_kmp iwlagn 3.0 -Obsoletes: compat-ath9k <= 3.0 -Provides: compat-ath9k = 3.0 -%obsolete_kmp compat-ath9k 3.0 -%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 -%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 -%obsolete_kmp rt3090 2.4.0.4_3 -%obsolete_kmp rt3592 2.4.1.1_3 -%obsolete_kmp rt5390 2.4.0.4_3 -%obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -884,11 +885,11 @@ rm %my_builddir/tmp Summary: Kernel for Samsung's Exynos SoC - base modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Provides: multiversion(kernel) Conflicts: %name = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd @@ -921,12 +922,12 @@ This package contains only the base modules, required in all installs. Summary: Kernel for Samsung's Exynos SoC - Unsupported kernel modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: %name-extra_%_target_cpu = %version-%release Provides: kernel-extra = %version-%source_rel +Provides: multiversion(kernel) Requires: %{name}_%_target_cpu = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu) @@ -975,8 +976,8 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules Group: Development/Sources -Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel +Provides: multiversion(kernel) Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) PreReq: coreutils diff --git a/kernel-lpae.changes b/kernel-lpae.changes index c280ba61..c4c269de 100644 --- a/kernel-lpae.changes +++ b/kernel-lpae.changes @@ -1,9 +1,27 @@ +------------------------------------------------------------------- +Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Require 'modutils' also in the subpackages +- commit 91f0a2e + +------------------------------------------------------------------- +Thu Jan 30 18:16:52 CET 2014 - mmarek@suse.cz + +- Reformat the spec files to what the buildservice expects +- commit 0b9e9a1 + ------------------------------------------------------------------- Wed Jan 29 17:04:23 CET 2014 - jslaby@suse.cz - Linux 3.13.1. - commit 01e2360 +------------------------------------------------------------------- +Mon Jan 27 10:20:14 CET 2014 - mmarek@suse.cz + +- Drop the _constraints file, we are using the prjconf setting for now +- commit a0aa890 + ------------------------------------------------------------------- Fri Jan 24 16:41:02 CET 2014 - jbeulich@suse.com diff --git a/kernel-lpae.spec b/kernel-lpae.spec index ff2d1915..8c69d1cd 100644 --- a/kernel-lpae.spec +++ b/kernel-lpae.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild + # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild @@ -59,22 +59,25 @@ Name: kernel-lpae Summary: Kernel for LPAE enabled systems +License: GPL-2.0 +Group: System/Kernel Version: 3.13.1 %if 0%{?is_kotd} -Release: .g01e2360 +Release: .g62e9557 %else Release: 0 %endif -License: GPL-2.0 -Group: System/Kernel Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse bc +BuildRequires: bc +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse # Used to sign the kernel in the buildservice BuildRequires: pesign-obs-integration -Provides: multiversion(kernel) -Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel +Provides: %{name}_%_target_cpu = %version-%release +Provides: multiversion(kernel) %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase @@ -125,7 +128,7 @@ BuildRequires: u-boot-tools #!BuildIgnore: xen %endif -Obsoletes: microcode_ctl +Obsoletes: microcode_ctl %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions @@ -145,11 +148,9 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel - Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc -Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -265,27 +266,27 @@ Provides: %1-kmp-%build_flavor = %2 # 11.1 %obsolete_kmp quickcam 0.6.7 # sle11-sp1 -%obsolete_kmp wacom 0.8.1_3 -%obsolete_kmp btrfs 0_3 -%obsolete_kmp brocade-bna 2.1.0.0_3 -%obsolete_kmp hyper-v 0_3 -%obsolete_kmp intel-e1000e 2.2.14 -%obsolete_kmp drm 3.7_3.1 -Obsoletes: firewire <= 3.0 -Provides: firewire = 3.0 -%obsolete_kmp firewire 3.0 -%obsolete_kmp iwlagn 3.0 -Obsoletes: compat-ath9k <= 3.0 -Provides: compat-ath9k = 3.0 -%obsolete_kmp compat-ath9k 3.0 -%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 -%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 -%obsolete_kmp rt3090 2.4.0.4_3 -%obsolete_kmp rt3592 2.4.1.1_3 -%obsolete_kmp rt5390 2.4.0.4_3 -%obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -885,11 +886,11 @@ rm %my_builddir/tmp Summary: Kernel for LPAE enabled systems - base modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Provides: multiversion(kernel) Conflicts: %name = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd @@ -923,12 +924,12 @@ This package contains only the base modules, required in all installs. Summary: Kernel for LPAE enabled systems - Unsupported kernel modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: %name-extra_%_target_cpu = %version-%release Provides: kernel-extra = %version-%source_rel +Provides: multiversion(kernel) Requires: %{name}_%_target_cpu = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu) @@ -978,8 +979,8 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules Group: Development/Sources -Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel +Provides: multiversion(kernel) Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) PreReq: coreutils diff --git a/kernel-obs-build.changes b/kernel-obs-build.changes index c280ba61..c4c269de 100644 --- a/kernel-obs-build.changes +++ b/kernel-obs-build.changes @@ -1,9 +1,27 @@ +------------------------------------------------------------------- +Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Require 'modutils' also in the subpackages +- commit 91f0a2e + +------------------------------------------------------------------- +Thu Jan 30 18:16:52 CET 2014 - mmarek@suse.cz + +- Reformat the spec files to what the buildservice expects +- commit 0b9e9a1 + ------------------------------------------------------------------- Wed Jan 29 17:04:23 CET 2014 - jslaby@suse.cz - Linux 3.13.1. - commit 01e2360 +------------------------------------------------------------------- +Mon Jan 27 10:20:14 CET 2014 - mmarek@suse.cz + +- Drop the _constraints file, we are using the prjconf setting for now +- commit a0aa890 + ------------------------------------------------------------------- Fri Jan 24 16:41:02 CET 2014 - jbeulich@suse.com diff --git a/kernel-obs-build.spec b/kernel-obs-build.spec index 08ab1eba..4882be8f 100644 --- a/kernel-obs-build.spec +++ b/kernel-obs-build.spec @@ -1,7 +1,7 @@ # # spec file for package kernel-obs-build # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,30 +14,31 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - # needsrootforbuild + #!BuildIgnore: post-build-checks -Name: kernel-obs-build -BuildRequires: mkinitrd -BuildRequires: device-mapper -BuildRequires: coreutils util-linux +Name: kernel-obs-build +BuildRequires: coreutils +BuildRequires: device-mapper +BuildRequires: mkinitrd +BuildRequires: util-linux -BuildRequires: kernel-default +BuildRequires: kernel-default %ifarch %ix86 x86_64 -BuildRequires: kernel-xen +BuildRequires: kernel-xen %endif %if 0%{?suse_version} < 1200 # For SLE 11 -BuildRequires: yast2-bootloader +BuildRequires: yast2-bootloader BuildRoot: %{_tmppath}/%{name}-%{version}-build -Group: SLES %endif -License: GPL -Summary: package kernel and initrd for OBS VM builds -Version: 1 -Release: 0 +Summary: package kernel and initrd for OBS VM builds +License: GPL-2.0 +Group: SLES +Version: 1 +Release: 0 %description This package is repackaging already compiled kernels to make them usable @@ -80,3 +81,4 @@ cp -v /tmp/initrd.xen $RPM_BUILD_ROOT/.build.initrd.xen /.build.kernel.* /.build.initrd.* +%changelog diff --git a/kernel-obs-qa.changes b/kernel-obs-qa.changes index c280ba61..c4c269de 100644 --- a/kernel-obs-qa.changes +++ b/kernel-obs-qa.changes @@ -1,9 +1,27 @@ +------------------------------------------------------------------- +Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Require 'modutils' also in the subpackages +- commit 91f0a2e + +------------------------------------------------------------------- +Thu Jan 30 18:16:52 CET 2014 - mmarek@suse.cz + +- Reformat the spec files to what the buildservice expects +- commit 0b9e9a1 + ------------------------------------------------------------------- Wed Jan 29 17:04:23 CET 2014 - jslaby@suse.cz - Linux 3.13.1. - commit 01e2360 +------------------------------------------------------------------- +Mon Jan 27 10:20:14 CET 2014 - mmarek@suse.cz + +- Drop the _constraints file, we are using the prjconf setting for now +- commit a0aa890 + ------------------------------------------------------------------- Fri Jan 24 16:41:02 CET 2014 - jbeulich@suse.com diff --git a/kernel-obs-qa.spec b/kernel-obs-qa.spec index 08cbe121..e0b8841b 100644 --- a/kernel-obs-qa.spec +++ b/kernel-obs-qa.spec @@ -1,7 +1,7 @@ # -# spec file for package kernel-obs-build +# spec file for package kernel-obs-qa # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,24 +14,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - # needsrootforbuild -Name: kernel-obs-qa -BuildRequires: module-init-tools -BuildRequires: kernel-default + +Name: kernel-obs-qa +BuildRequires: kernel-default +BuildRequires: module-init-tools %ifarch %ix86 x86_64 -BuildRequires: kernel-xen +BuildRequires: kernel-xen %endif %if 0%{?suse_version} < 1200 # for SLE 11 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Group: SLES %endif -License: GPL -Summary: Basic QA tests for the kernel -Version: 1 -Release: 0 +Summary: Basic QA tests for the kernel +License: GPL-2.0 +Group: SLES +Version: 1 +Release: 0 %description This package is using the kernel compiled within Open Build Service(OBS) @@ -59,3 +59,4 @@ touch %{buildroot}/usr/share/kernel-qa/logfile %defattr(-,root,root) /usr/share/kernel-qa +%changelog diff --git a/kernel-pae.changes b/kernel-pae.changes index c280ba61..c4c269de 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,9 +1,27 @@ +------------------------------------------------------------------- +Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Require 'modutils' also in the subpackages +- commit 91f0a2e + +------------------------------------------------------------------- +Thu Jan 30 18:16:52 CET 2014 - mmarek@suse.cz + +- Reformat the spec files to what the buildservice expects +- commit 0b9e9a1 + ------------------------------------------------------------------- Wed Jan 29 17:04:23 CET 2014 - jslaby@suse.cz - Linux 3.13.1. - commit 01e2360 +------------------------------------------------------------------- +Mon Jan 27 10:20:14 CET 2014 - mmarek@suse.cz + +- Drop the _constraints file, we are using the prjconf setting for now +- commit a0aa890 + ------------------------------------------------------------------- Fri Jan 24 16:41:02 CET 2014 - jbeulich@suse.com diff --git a/kernel-pae.spec b/kernel-pae.spec index e4f0f018..a84b3dfe 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild + # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild @@ -59,22 +59,25 @@ Name: kernel-pae Summary: Kernel with PAE Support +License: GPL-2.0 +Group: System/Kernel Version: 3.13.1 %if 0%{?is_kotd} -Release: .g01e2360 +Release: .g62e9557 %else Release: 0 %endif -License: GPL-2.0 -Group: System/Kernel Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse bc +BuildRequires: bc +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse # Used to sign the kernel in the buildservice BuildRequires: pesign-obs-integration -Provides: multiversion(kernel) -Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel +Provides: %{name}_%_target_cpu = %version-%release +Provides: multiversion(kernel) %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase @@ -125,7 +128,7 @@ BuildRequires: u-boot-tools #!BuildIgnore: xen %endif -Obsoletes: microcode_ctl +Obsoletes: microcode_ctl %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions @@ -150,11 +153,9 @@ Obsoletes: kernel-bigsmp <= 2.6.17 Provides: kernel-vmi = 2.6.38 Obsoletes: kernel-vmi <= 2.6.38 %endif - Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc -Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -270,27 +271,27 @@ Provides: %1-kmp-%build_flavor = %2 # 11.1 %obsolete_kmp quickcam 0.6.7 # sle11-sp1 -%obsolete_kmp wacom 0.8.1_3 -%obsolete_kmp btrfs 0_3 -%obsolete_kmp brocade-bna 2.1.0.0_3 -%obsolete_kmp hyper-v 0_3 -%obsolete_kmp intel-e1000e 2.2.14 -%obsolete_kmp drm 3.7_3.1 -Obsoletes: firewire <= 3.0 -Provides: firewire = 3.0 -%obsolete_kmp firewire 3.0 -%obsolete_kmp iwlagn 3.0 -Obsoletes: compat-ath9k <= 3.0 -Provides: compat-ath9k = 3.0 -%obsolete_kmp compat-ath9k 3.0 -%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 -%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 -%obsolete_kmp rt3090 2.4.0.4_3 -%obsolete_kmp rt3592 2.4.1.1_3 -%obsolete_kmp rt5390 2.4.0.4_3 -%obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -896,11 +897,11 @@ rm %my_builddir/tmp Summary: Kernel with PAE Support - base modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Provides: multiversion(kernel) Conflicts: %name = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd %ifarch %ix86 @@ -943,12 +944,12 @@ This package contains only the base modules, required in all installs. Summary: Kernel with PAE Support - Unsupported kernel modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: %name-extra_%_target_cpu = %version-%release Provides: kernel-extra = %version-%source_rel +Provides: multiversion(kernel) Requires: %{name}_%_target_cpu = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu) @@ -1004,8 +1005,8 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules Group: Development/Sources -Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel +Provides: multiversion(kernel) Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) PreReq: coreutils diff --git a/kernel-source.changes b/kernel-source.changes index c280ba61..c4c269de 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,9 +1,27 @@ +------------------------------------------------------------------- +Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Require 'modutils' also in the subpackages +- commit 91f0a2e + +------------------------------------------------------------------- +Thu Jan 30 18:16:52 CET 2014 - mmarek@suse.cz + +- Reformat the spec files to what the buildservice expects +- commit 0b9e9a1 + ------------------------------------------------------------------- Wed Jan 29 17:04:23 CET 2014 - jslaby@suse.cz - Linux 3.13.1. - commit 01e2360 +------------------------------------------------------------------- +Mon Jan 27 10:20:14 CET 2014 - mmarek@suse.cz + +- Drop the _constraints file, we are using the prjconf setting for now +- commit a0aa890 + ------------------------------------------------------------------- Fri Jan 24 16:41:02 CET 2014 - jbeulich@suse.com diff --git a/kernel-source.spec b/kernel-source.spec index fe381e93..0473b317 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -14,10 +14,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -# norootforbuild # icecream 0 + %define srcversion 3.13 %define patchversion 3.13.1 %define variant %{nil} @@ -29,26 +28,26 @@ Name: kernel-source Summary: The Linux Kernel Sources +License: GPL-2.0 +Group: Development/Sources Version: 3.13.1 %if 0%{?is_kotd} -Release: .g01e2360 +Release: .g62e9557 %else Release: 0 %endif -License: GPL-2.0 -Group: Development/Sources Url: http://www.kernel.org/ AutoReqProv: off -BuildRequires: coreutils sed +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: sed Requires(post): coreutils sed -Provides: multiversion(kernel) -Provides: linux Provides: %name = %version-%source_rel +Provides: linux +Provides: multiversion(kernel) Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc -Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -127,8 +126,8 @@ Linux kernel sources with many fixes and improvements. Summary: Development files needed for building kernel modules Group: Development/Sources AutoReqProv: off -Provides: multiversion(kernel) Provides: kernel-devel%variant = %version-%source_rel +Provides: multiversion(kernel) %description -n kernel-devel%variant Kernel-level headers and Makefiles required for development of @@ -140,8 +139,8 @@ external kernel modules. Summary: Vanilla Linux kernel sources with minor build fixes. Group: Development/Sources AutoReqProv: off -Provides: multiversion(kernel) Provides: %name-vanilla = %version-%source_rel +Provides: multiversion(kernel) %description vanilla Vanilla Linux kernel sources with minor build fixes. diff --git a/kernel-source.spec.in b/kernel-source.spec.in index d959115d..544a1c53 100644 --- a/kernel-source.spec.in +++ b/kernel-source.spec.in @@ -14,10 +14,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -# norootforbuild # icecream 0 + %define srcversion @SRCVERSION@ %define patchversion @PATCHVERSION@ %define variant @VARIANT@%{nil} @@ -29,26 +28,26 @@ Name: kernel-source@VARIANT@ Summary: The Linux Kernel Sources +License: GPL-2.0 +Group: Development/Sources Version: @RPMVERSION@ %if 0%{?is_kotd} Release: .g@COMMIT@ %else Release: @RELEASE@ %endif -License: GPL-2.0 -Group: Development/Sources Url: http://www.kernel.org/ AutoReqProv: off -BuildRequires: coreutils sed +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: sed Requires(post): coreutils sed -Provides: multiversion(kernel) -Provides: linux Provides: %name = %version-%source_rel +Provides: linux +Provides: multiversion(kernel) Source0: @TARBALL_URL@linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc -Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -127,8 +126,8 @@ Linux kernel sources with many fixes and improvements. Summary: Development files needed for building kernel modules Group: Development/Sources AutoReqProv: off -Provides: multiversion(kernel) Provides: kernel-devel%variant = %version-%source_rel +Provides: multiversion(kernel) %description -n kernel-devel%variant Kernel-level headers and Makefiles required for development of @@ -140,8 +139,8 @@ external kernel modules. Summary: Vanilla Linux kernel sources with minor build fixes. Group: Development/Sources AutoReqProv: off -Provides: multiversion(kernel) Provides: %name-vanilla = %version-%source_rel +Provides: multiversion(kernel) %description vanilla Vanilla Linux kernel sources with minor build fixes. diff --git a/kernel-syms.changes b/kernel-syms.changes index c280ba61..c4c269de 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,9 +1,27 @@ +------------------------------------------------------------------- +Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Require 'modutils' also in the subpackages +- commit 91f0a2e + +------------------------------------------------------------------- +Thu Jan 30 18:16:52 CET 2014 - mmarek@suse.cz + +- Reformat the spec files to what the buildservice expects +- commit 0b9e9a1 + ------------------------------------------------------------------- Wed Jan 29 17:04:23 CET 2014 - jslaby@suse.cz - Linux 3.13.1. - commit 01e2360 +------------------------------------------------------------------- +Mon Jan 27 10:20:14 CET 2014 - mmarek@suse.cz + +- Drop the _constraints file, we are using the prjconf setting for now +- commit a0aa890 + ------------------------------------------------------------------- Fri Jan 24 16:41:02 CET 2014 - jbeulich@suse.com diff --git a/kernel-syms.spec b/kernel-syms.spec index 6d856579..e938ab71 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define variant %{nil} @@ -23,10 +22,12 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) +License: GPL-2.0 +Group: Development/Sources Version: 3.13.1 %if %using_buildservice %if 0%{?is_kotd} -Release: .g01e2360 +Release: .g62e9557 %else Release: 0 %endif @@ -34,8 +35,6 @@ 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-2.0 -Group: Development/Sources Url: http://www.kernel.org/ AutoReqProv: off BuildRequires: coreutils @@ -57,8 +56,8 @@ Requires: kernel-pae-devel = %version-%source_rel %ifarch %ix86 x86_64 Requires: kernel-xen-devel = %version-%source_rel %endif -Provides: multiversion(kernel) Provides: %name = %version-%source_rel +Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/kernel-syms.spec.in b/kernel-syms.spec.in index 10d665e4..0ef0a33c 100644 --- a/kernel-syms.spec.in +++ b/kernel-syms.spec.in @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define variant @VARIANT@%{nil} @@ -23,6 +22,8 @@ Name: kernel-syms@VARIANT@ Summary: Kernel Symbol Versions (modversions) +License: GPL-2.0 +Group: Development/Sources Version: @RPMVERSION@ %if %using_buildservice %if 0%{?is_kotd} @@ -34,14 +35,12 @@ 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-2.0 -Group: Development/Sources Url: http://www.kernel.org/ AutoReqProv: off BuildRequires: coreutils @REQUIRES@ -Provides: multiversion(kernel) Provides: %name = %version-%source_rel +Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/kernel-trace.changes b/kernel-trace.changes index c280ba61..c4c269de 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -1,9 +1,27 @@ +------------------------------------------------------------------- +Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Require 'modutils' also in the subpackages +- commit 91f0a2e + +------------------------------------------------------------------- +Thu Jan 30 18:16:52 CET 2014 - mmarek@suse.cz + +- Reformat the spec files to what the buildservice expects +- commit 0b9e9a1 + ------------------------------------------------------------------- Wed Jan 29 17:04:23 CET 2014 - jslaby@suse.cz - Linux 3.13.1. - commit 01e2360 +------------------------------------------------------------------- +Mon Jan 27 10:20:14 CET 2014 - mmarek@suse.cz + +- Drop the _constraints file, we are using the prjconf setting for now +- commit a0aa890 + ------------------------------------------------------------------- Fri Jan 24 16:41:02 CET 2014 - jbeulich@suse.com diff --git a/kernel-trace.spec b/kernel-trace.spec index 68bda9bf..d76ed0b9 100644 --- a/kernel-trace.spec +++ b/kernel-trace.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild + # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild @@ -59,22 +59,25 @@ Name: kernel-trace Summary: The Standard Kernel with Tracing Features +License: GPL-2.0 +Group: System/Kernel Version: 3.13.1 %if 0%{?is_kotd} -Release: .g01e2360 +Release: .g62e9557 %else Release: 0 %endif -License: GPL-2.0 -Group: System/Kernel Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse bc +BuildRequires: bc +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse # Used to sign the kernel in the buildservice BuildRequires: pesign-obs-integration -Provides: multiversion(kernel) -Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel +Provides: %{name}_%_target_cpu = %version-%release +Provides: multiversion(kernel) %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase @@ -125,7 +128,7 @@ BuildRequires: u-boot-tools #!BuildIgnore: xen %endif -Obsoletes: microcode_ctl +Obsoletes: microcode_ctl %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions @@ -148,11 +151,9 @@ Provides: kernel = %version-%source_rel Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 %endif - Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc -Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -268,27 +269,27 @@ Provides: %1-kmp-%build_flavor = %2 # 11.1 %obsolete_kmp quickcam 0.6.7 # sle11-sp1 -%obsolete_kmp wacom 0.8.1_3 -%obsolete_kmp btrfs 0_3 -%obsolete_kmp brocade-bna 2.1.0.0_3 -%obsolete_kmp hyper-v 0_3 -%obsolete_kmp intel-e1000e 2.2.14 -%obsolete_kmp drm 3.7_3.1 -Obsoletes: firewire <= 3.0 -Provides: firewire = 3.0 -%obsolete_kmp firewire 3.0 -%obsolete_kmp iwlagn 3.0 -Obsoletes: compat-ath9k <= 3.0 -Provides: compat-ath9k = 3.0 -%obsolete_kmp compat-ath9k 3.0 -%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 -%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 -%obsolete_kmp rt3090 2.4.0.4_3 -%obsolete_kmp rt3592 2.4.1.1_3 -%obsolete_kmp rt5390 2.4.0.4_3 -%obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -887,11 +888,11 @@ rm %my_builddir/tmp Summary: The Standard Kernel with Tracing Features - base modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Provides: multiversion(kernel) Conflicts: %name = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd @@ -924,12 +925,12 @@ This package contains only the base modules, required in all installs. Summary: The Standard Kernel with Tracing Features - Unsupported kernel modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: %name-extra_%_target_cpu = %version-%release Provides: kernel-extra = %version-%source_rel +Provides: multiversion(kernel) Requires: %{name}_%_target_cpu = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu) @@ -978,8 +979,8 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules Group: Development/Sources -Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel +Provides: multiversion(kernel) Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) PreReq: coreutils diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index c280ba61..c4c269de 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,9 +1,27 @@ +------------------------------------------------------------------- +Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Require 'modutils' also in the subpackages +- commit 91f0a2e + +------------------------------------------------------------------- +Thu Jan 30 18:16:52 CET 2014 - mmarek@suse.cz + +- Reformat the spec files to what the buildservice expects +- commit 0b9e9a1 + ------------------------------------------------------------------- Wed Jan 29 17:04:23 CET 2014 - jslaby@suse.cz - Linux 3.13.1. - commit 01e2360 +------------------------------------------------------------------- +Mon Jan 27 10:20:14 CET 2014 - mmarek@suse.cz + +- Drop the _constraints file, we are using the prjconf setting for now +- commit a0aa890 + ------------------------------------------------------------------- Fri Jan 24 16:41:02 CET 2014 - jbeulich@suse.com diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 2d0417f5..6eb5f95b 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild + # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild @@ -59,22 +59,25 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches +License: GPL-2.0 +Group: System/Kernel Version: 3.13.1 %if 0%{?is_kotd} -Release: .g01e2360 +Release: .g62e9557 %else Release: 0 %endif -License: GPL-2.0 -Group: System/Kernel Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse bc +BuildRequires: bc +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse # Used to sign the kernel in the buildservice BuildRequires: pesign-obs-integration -Provides: multiversion(kernel) -Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel +Provides: %{name}_%_target_cpu = %version-%release +Provides: multiversion(kernel) %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase @@ -125,7 +128,7 @@ BuildRequires: u-boot-tools #!BuildIgnore: xen %endif -Obsoletes: microcode_ctl +Obsoletes: microcode_ctl %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions @@ -145,11 +148,9 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel - Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc -Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -265,27 +266,27 @@ Provides: %1-kmp-%build_flavor = %2 # 11.1 %obsolete_kmp quickcam 0.6.7 # sle11-sp1 -%obsolete_kmp wacom 0.8.1_3 -%obsolete_kmp btrfs 0_3 -%obsolete_kmp brocade-bna 2.1.0.0_3 -%obsolete_kmp hyper-v 0_3 -%obsolete_kmp intel-e1000e 2.2.14 -%obsolete_kmp drm 3.7_3.1 -Obsoletes: firewire <= 3.0 -Provides: firewire = 3.0 -%obsolete_kmp firewire 3.0 -%obsolete_kmp iwlagn 3.0 -Obsoletes: compat-ath9k <= 3.0 -Provides: compat-ath9k = 3.0 -%obsolete_kmp compat-ath9k 3.0 -%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 -%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 -%obsolete_kmp rt3090 2.4.0.4_3 -%obsolete_kmp rt3592 2.4.1.1_3 -%obsolete_kmp rt5390 2.4.0.4_3 -%obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -884,11 +885,11 @@ rm %my_builddir/tmp Summary: The Standard Kernel - without any SUSE patches - base modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Provides: multiversion(kernel) Conflicts: %name = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd @@ -921,12 +922,12 @@ This package contains only the base modules, required in all installs. Summary: The Standard Kernel - without any SUSE patches - Unsupported kernel modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: %name-extra_%_target_cpu = %version-%release Provides: kernel-extra = %version-%source_rel +Provides: multiversion(kernel) Requires: %{name}_%_target_cpu = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu) @@ -975,8 +976,8 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules Group: Development/Sources -Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel +Provides: multiversion(kernel) Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) PreReq: coreutils diff --git a/kernel-xen.changes b/kernel-xen.changes index c280ba61..c4c269de 100644 --- a/kernel-xen.changes +++ b/kernel-xen.changes @@ -1,9 +1,27 @@ +------------------------------------------------------------------- +Thu Jan 30 18:23:25 CET 2014 - mmarek@suse.cz + +- rpm/kernel-binary.spec.in: Require 'modutils' also in the subpackages +- commit 91f0a2e + +------------------------------------------------------------------- +Thu Jan 30 18:16:52 CET 2014 - mmarek@suse.cz + +- Reformat the spec files to what the buildservice expects +- commit 0b9e9a1 + ------------------------------------------------------------------- Wed Jan 29 17:04:23 CET 2014 - jslaby@suse.cz - Linux 3.13.1. - commit 01e2360 +------------------------------------------------------------------- +Mon Jan 27 10:20:14 CET 2014 - mmarek@suse.cz + +- Drop the _constraints file, we are using the prjconf setting for now +- commit a0aa890 + ------------------------------------------------------------------- Fri Jan 24 16:41:02 CET 2014 - jbeulich@suse.com diff --git a/kernel-xen.spec b/kernel-xen.spec index 5fc7464f..55cd4945 100644 --- a/kernel-xen.spec +++ b/kernel-xen.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild + # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild @@ -59,22 +59,25 @@ Name: kernel-xen Summary: The Xen Kernel +License: GPL-2.0 +Group: System/Kernel Version: 3.13.1 %if 0%{?is_kotd} -Release: .g01e2360 +Release: .g62e9557 %else Release: 0 %endif -License: GPL-2.0 -Group: System/Kernel Url: http://www.kernel.org/ -BuildRequires: coreutils module-init-tools sparse bc +BuildRequires: bc +BuildRequires: coreutils BuildRequires: fdupes +BuildRequires: module-init-tools +BuildRequires: sparse # Used to sign the kernel in the buildservice BuildRequires: pesign-obs-integration -Provides: multiversion(kernel) -Provides: %{name}_%_target_cpu = %version-%release Provides: %name = %version-%source_rel +Provides: %{name}_%_target_cpu = %version-%release +Provides: multiversion(kernel) %if %split_base Provides: kernel-base = %version-%source_rel # Obsolete the -base subpackage from 11.1 and 11.2 development phase @@ -125,7 +128,7 @@ BuildRequires: u-boot-tools #!BuildIgnore: xen %endif -Obsoletes: microcode_ctl +Obsoletes: microcode_ctl %if %build_vanilla # force bzip2 instead of lzma compression to allow install on older dist versions @@ -148,11 +151,9 @@ Provides: kernel = %version-%source_rel Provides: kernel-xenpae = 2.6.17 Obsoletes: kernel-xenpae <= 2.6.17 %endif - Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc -Source4: _constraints Source8: devel-pre.sh Source9: devel-post.sh Source10: preun.sh @@ -268,27 +269,27 @@ Provides: %1-kmp-%build_flavor = %2 # 11.1 %obsolete_kmp quickcam 0.6.7 # sle11-sp1 -%obsolete_kmp wacom 0.8.1_3 -%obsolete_kmp btrfs 0_3 -%obsolete_kmp brocade-bna 2.1.0.0_3 -%obsolete_kmp hyper-v 0_3 -%obsolete_kmp intel-e1000e 2.2.14 -%obsolete_kmp drm 3.7_3.1 -Obsoletes: firewire <= 3.0 -Provides: firewire = 3.0 -%obsolete_kmp firewire 3.0 -%obsolete_kmp iwlagn 3.0 -Obsoletes: compat-ath9k <= 3.0 -Provides: compat-ath9k = 3.0 -%obsolete_kmp compat-ath9k 3.0 -%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 -%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 -%obsolete_kmp rt3090 2.4.0.4_3 -%obsolete_kmp rt3592 2.4.1.1_3 -%obsolete_kmp rt5390 2.4.0.4_3 -%obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 +%obsolete_kmp wacom 0.8.1_3 +%obsolete_kmp btrfs 0_3 +%obsolete_kmp brocade-bna 2.1.0.0_3 +%obsolete_kmp hyper-v 0_3 +%obsolete_kmp intel-e1000e 2.2.14 +%obsolete_kmp drm 3.7_3.1 +Obsoletes: firewire <= 3.0 +Provides: firewire = 3.0 +%obsolete_kmp firewire 3.0 +%obsolete_kmp iwlagn 3.0 +Obsoletes: compat-ath9k <= 3.0 +Provides: compat-ath9k = 3.0 +%obsolete_kmp compat-ath9k 3.0 +%obsolete_kmp realtek-r8192ce_pci 2.6.0005_3 +%obsolete_kmp realtek-r8192se_pci 2.6.0019.1207.2010_3 +%obsolete_kmp rt3090 2.4.0.4_3 +%obsolete_kmp rt3592 2.4.1.1_3 +%obsolete_kmp rt5390 2.4.0.4_3 +%obsolete_kmp ath3k 1.0_3 +Obsoletes: ath3k-firmware <= 1.0 +Provides: ath3k-firmware = 1.0 # Provide the exported symbols as "ksym(symbol) = hash" %define __find_provides %_sourcedir/find-provides %name @@ -890,11 +891,11 @@ rm %my_builddir/tmp Summary: The Xen Kernel - base modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: kernel-base = %version-%source_rel +Provides: multiversion(kernel) Conflicts: %name = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd @@ -930,12 +931,12 @@ This package contains only the base modules, required in all installs. Summary: The Xen Kernel - Unsupported kernel modules Group: System/Kernel Url: http://www.kernel.org/ -Provides: multiversion(kernel) Provides: %name-extra_%_target_cpu = %version-%release Provides: kernel-extra = %version-%source_rel +Provides: multiversion(kernel) Requires: %{name}_%_target_cpu = %version-%release Requires(pre): coreutils awk -Requires(post): module-init-tools +Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu) @@ -987,8 +988,8 @@ kmsg message documentation comments. %package devel Summary: Development files necessary for building kernel modules Group: Development/Sources -Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel +Provides: multiversion(kernel) Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) PreReq: coreutils diff --git a/mkspec b/mkspec index a85b25ca..4c8cb4b2 100644 --- a/mkspec +++ b/mkspec @@ -46,10 +46,10 @@ $rpmversion =~ s/-/./g; $rpmrelease =~ s/-/./g; -my $sources = join("", $templates{source} =~ /\nSource\d+:[^\n]*/mg); +my $sources = join("\n", $templates{source} =~ /^Source\d+:[^\n]*/msg); # Find all SourceN: foo.tar.(bz2|xz) lines and generate the NoSource: # lines and the %setup line -my @tarballs = ($sources =~ /\nSource(\d+):[^\n]*\.tar\.(?:bz2|xz)/mg); +my @tarballs = ($sources =~ /^Source(\d+):[^\n]*\.tar\.(?:bz2|xz)/msg); my $nosource = join("\n", map { "NoSource: $_" } @tarballs); # Source0 (the linux tarball) is unpacked manually @tarballs = grep { $_ > 0 } @tarballs; diff --git a/source-timestamp b/source-timestamp index 7e074c45..100ac0ce 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2014-01-29 17:04:23 +0100 -GIT Revision: 01e2360b857223ffe9fe82cc938d95fca8bec098 +2014-01-30 18:23:45 +0100 +GIT Revision: 62e9557f1d156f56f847422c72bede5c198aafb7 GIT Branch: master