From 0c698e99ba8cfb0b86f2b4ed81b992e7e964ed2ecf9a144ccef7882678f79c23 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Thu, 15 Dec 2011 06:01:30 +0000 Subject: [PATCH] GIT Revision: ac568039358d552b509603fb1653f2aac95087e0 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=7179 --- kernel-debug.changes | 7 +++++++ kernel-debug.spec | 2 +- kernel-default.changes | 7 +++++++ kernel-default.spec | 2 +- kernel-desktop.changes | 7 +++++++ kernel-desktop.spec | 2 +- kernel-docs.changes | 7 +++++++ kernel-ec2.changes | 7 +++++++ kernel-ec2.spec | 2 +- kernel-imx51.changes | 7 +++++++ kernel-imx51.spec | 2 +- kernel-omap2plus.changes | 7 +++++++ kernel-omap2plus.spec | 2 +- kernel-pae.changes | 7 +++++++ kernel-pae.spec | 2 +- kernel-ppc64.changes | 7 +++++++ kernel-ppc64.spec | 2 +- kernel-s390.changes | 7 +++++++ kernel-s390.spec | 2 +- kernel-source.changes | 7 +++++++ kernel-source.spec | 2 +- kernel-source.spec.in | 2 +- kernel-syms.changes | 7 +++++++ kernel-tegra.changes | 7 +++++++ kernel-tegra.spec | 2 +- kernel-trace.changes | 7 +++++++ kernel-trace.spec | 2 +- kernel-vanilla.changes | 7 +++++++ kernel-vanilla.spec | 2 +- kernel-xen.changes | 7 +++++++ kernel-xen.spec | 2 +- mkspec | 13 ++++++++++--- source-timestamp | 4 ++-- 33 files changed, 139 insertions(+), 20 deletions(-) diff --git a/kernel-debug.changes b/kernel-debug.changes index 85d450ff..1dd9e26c 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz + +- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and + do not generate any URL for linux-next and vanilla snapshots. +- commit 1548daf + ------------------------------------------------------------------- Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz diff --git a/kernel-debug.spec b/kernel-debug.spec index 5a2e6ccc..042a5325 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -135,7 +135,7 @@ Provides: kernel-kdump Obsoletes: kernel-kdump %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh diff --git a/kernel-default.changes b/kernel-default.changes index 85d450ff..1dd9e26c 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz + +- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and + do not generate any URL for linux-next and vanilla snapshots. +- commit 1548daf + ------------------------------------------------------------------- Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz diff --git a/kernel-default.spec b/kernel-default.spec index 7a77c776..b0258867 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -151,7 +151,7 @@ Provides: smp kernel-smp Obsoletes: smp kernel-smp %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh diff --git a/kernel-desktop.changes b/kernel-desktop.changes index 85d450ff..1dd9e26c 100644 --- a/kernel-desktop.changes +++ b/kernel-desktop.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz + +- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and + do not generate any URL for linux-next and vanilla snapshots. +- commit 1548daf + ------------------------------------------------------------------- Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz diff --git a/kernel-desktop.spec b/kernel-desktop.spec index e4fa95c0..d0645305 100644 --- a/kernel-desktop.spec +++ b/kernel-desktop.spec @@ -132,7 +132,7 @@ Conflicts: libc.so.6()(64bit) Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh diff --git a/kernel-docs.changes b/kernel-docs.changes index 85d450ff..1dd9e26c 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz + +- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and + do not generate any URL for linux-next and vanilla snapshots. +- commit 1548daf + ------------------------------------------------------------------- Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz diff --git a/kernel-ec2.changes b/kernel-ec2.changes index 85d450ff..1dd9e26c 100644 --- a/kernel-ec2.changes +++ b/kernel-ec2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz + +- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and + do not generate any URL for linux-next and vanilla snapshots. +- commit 1548daf + ------------------------------------------------------------------- Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz diff --git a/kernel-ec2.spec b/kernel-ec2.spec index 49b30d05..20d36157 100644 --- a/kernel-ec2.spec +++ b/kernel-ec2.spec @@ -132,7 +132,7 @@ Conflicts: libc.so.6()(64bit) Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh diff --git a/kernel-imx51.changes b/kernel-imx51.changes index 85d450ff..1dd9e26c 100644 --- a/kernel-imx51.changes +++ b/kernel-imx51.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz + +- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and + do not generate any URL for linux-next and vanilla snapshots. +- commit 1548daf + ------------------------------------------------------------------- Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz diff --git a/kernel-imx51.spec b/kernel-imx51.spec index 72e3b998..d54bd74f 100644 --- a/kernel-imx51.spec +++ b/kernel-imx51.spec @@ -132,7 +132,7 @@ Conflicts: libc.so.6()(64bit) Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh diff --git a/kernel-omap2plus.changes b/kernel-omap2plus.changes index 85d450ff..1dd9e26c 100644 --- a/kernel-omap2plus.changes +++ b/kernel-omap2plus.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz + +- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and + do not generate any URL for linux-next and vanilla snapshots. +- commit 1548daf + ------------------------------------------------------------------- Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz diff --git a/kernel-omap2plus.spec b/kernel-omap2plus.spec index 76fd9ab3..2da83db5 100644 --- a/kernel-omap2plus.spec +++ b/kernel-omap2plus.spec @@ -132,7 +132,7 @@ Conflicts: libc.so.6()(64bit) Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh diff --git a/kernel-pae.changes b/kernel-pae.changes index 85d450ff..1dd9e26c 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz + +- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and + do not generate any URL for linux-next and vanilla snapshots. +- commit 1548daf + ------------------------------------------------------------------- Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz diff --git a/kernel-pae.spec b/kernel-pae.spec index 8ff75e18..6c57de83 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -135,7 +135,7 @@ Provides: kernel-bigsmp Obsoletes: kernel-bigsmp %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh diff --git a/kernel-ppc64.changes b/kernel-ppc64.changes index 85d450ff..1dd9e26c 100644 --- a/kernel-ppc64.changes +++ b/kernel-ppc64.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz + +- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and + do not generate any URL for linux-next and vanilla snapshots. +- commit 1548daf + ------------------------------------------------------------------- Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz diff --git a/kernel-ppc64.spec b/kernel-ppc64.spec index baf8379a..db08541c 100644 --- a/kernel-ppc64.spec +++ b/kernel-ppc64.spec @@ -139,7 +139,7 @@ Provides: kernel-kdump Obsoletes: kernel-kdump %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh diff --git a/kernel-s390.changes b/kernel-s390.changes index 85d450ff..1dd9e26c 100644 --- a/kernel-s390.changes +++ b/kernel-s390.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz + +- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and + do not generate any URL for linux-next and vanilla snapshots. +- commit 1548daf + ------------------------------------------------------------------- Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz diff --git a/kernel-s390.spec b/kernel-s390.spec index 1d721c53..0380037f 100644 --- a/kernel-s390.spec +++ b/kernel-s390.spec @@ -135,7 +135,7 @@ Provides: kernel-32bit Obsoletes: kernel-32bit %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh diff --git a/kernel-source.changes b/kernel-source.changes index 85d450ff..1dd9e26c 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz + +- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and + do not generate any URL for linux-next and vanilla snapshots. +- commit 1548daf + ------------------------------------------------------------------- Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz diff --git a/kernel-source.spec b/kernel-source.spec index 41485550..7a96c8d6 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -41,7 +41,7 @@ Requires(post): coreutils sed Provides: multiversion(kernel) Provides: linux Provides: %name = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh diff --git a/kernel-source.spec.in b/kernel-source.spec.in index 180873db..19c651d6 100644 --- a/kernel-source.spec.in +++ b/kernel-source.spec.in @@ -41,7 +41,7 @@ Requires(post): coreutils sed Provides: multiversion(kernel) Provides: linux Provides: %name = %version-%source_rel -Source0: http://www.kernel.org/@FTP_DIRECTORY@/linux-%srcversion.tar.bz2 +Source0: @TARBALL_URL@linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh diff --git a/kernel-syms.changes b/kernel-syms.changes index 85d450ff..1dd9e26c 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz + +- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and + do not generate any URL for linux-next and vanilla snapshots. +- commit 1548daf + ------------------------------------------------------------------- Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz diff --git a/kernel-tegra.changes b/kernel-tegra.changes index 85d450ff..1dd9e26c 100644 --- a/kernel-tegra.changes +++ b/kernel-tegra.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz + +- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and + do not generate any URL for linux-next and vanilla snapshots. +- commit 1548daf + ------------------------------------------------------------------- Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz diff --git a/kernel-tegra.spec b/kernel-tegra.spec index d6e4803a..3b4eb1ff 100644 --- a/kernel-tegra.spec +++ b/kernel-tegra.spec @@ -132,7 +132,7 @@ Conflicts: libc.so.6()(64bit) Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh diff --git a/kernel-trace.changes b/kernel-trace.changes index 85d450ff..1dd9e26c 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz + +- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and + do not generate any URL for linux-next and vanilla snapshots. +- commit 1548daf + ------------------------------------------------------------------- Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz diff --git a/kernel-trace.spec b/kernel-trace.spec index 2c937a65..2651acff 100644 --- a/kernel-trace.spec +++ b/kernel-trace.spec @@ -143,7 +143,7 @@ Provides: kernel-64bit Obsoletes: kernel-64bit %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index 85d450ff..1dd9e26c 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz + +- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and + do not generate any URL for linux-next and vanilla snapshots. +- commit 1548daf + ------------------------------------------------------------------- Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 46d4602b..0eb239b6 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -139,7 +139,7 @@ Provides: kernel-64bit Obsoletes: kernel-64bit %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh diff --git a/kernel-xen.changes b/kernel-xen.changes index 85d450ff..1dd9e26c 100644 --- a/kernel-xen.changes +++ b/kernel-xen.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 14 13:51:41 CET 2011 - mmarek@suse.cz + +- rpm/kernel-source.spec.in, rpm/mkspec: Fix tarball URL for -rcX and + do not generate any URL for linux-next and vanilla snapshots. +- commit 1548daf + ------------------------------------------------------------------- Tue Dec 13 23:00:02 CET 2011 - mmarek@suse.cz diff --git a/kernel-xen.spec b/kernel-xen.spec index cf3f1490..222d7a05 100644 --- a/kernel-xen.spec +++ b/kernel-xen.spec @@ -132,7 +132,7 @@ Conflicts: libc.so.6()(64bit) Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.bz2 +Source0: http://www.kernel.org/pub/linux/kernel/v3.x/testing/linux-%srcversion.tar.bz2 Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh diff --git a/mkspec b/mkspec index c36cb2ab..ac5c9f14 100644 --- a/mkspec +++ b/mkspec @@ -65,15 +65,22 @@ my $unpack_patches = join(" ", map { "-a $_" } @tarballs); my $scripts = join(",", grep { is_script($_) } ($sources =~ /\nSource\d+:\s*([^\s]*)/mg)); -(my $major_version = $srcversion) =~ s/\..*//; -my $ftp_directory = "pub/linux/kernel/v$major_version.x"; +my $tarball_url; +if ($srcversion =~ /^(\d+)(?:\.\d+)*(-rc\d+)?$/) { + $tarball_url = "http://www.kernel.org/pub/linux/kernel/v$1.x/"; + $tarball_url .= "testing/" if $2; +} else { + # kernel.org has no tarballs for linux-next or vanilla snapshots + $tarball_url = ""; +} + my %macros = ( VARIANT => $variant, VANILLA_ONLY => $vanilla_only, SRCVERSION => $srcversion, PATCHVERSION => $patchversion, RPMVERSION => $rpmversion, - FTP_DIRECTORY => $ftp_directory, + TARBALL_URL => $tarball_url, RELEASE => $rpmrelease, SOURCES => $sources, NOSOURCE => $nosource, diff --git a/source-timestamp b/source-timestamp index 67a65223..7e02f87b 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2011-12-13 23:03:29 +0100 -GIT Revision: d20736defed598704cae363f805d7eb26f280384 +2011-12-14 13:52:37 +0100 +GIT Revision: ac568039358d552b509603fb1653f2aac95087e0 GIT Branch: master