From 8fce7bc09c30cf9b67630256a8d9d6fe03a5916c92a9d32c4483481cf1424f52 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Wed, 8 Dec 2010 22:33:31 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-source?expand=0&rev=6879 --- kernel-debug.changes | 7 +++++++ kernel-debug.spec | 4 ++++ kernel-default.changes | 7 +++++++ kernel-default.spec | 4 ++++ kernel-desktop.changes | 7 +++++++ kernel-desktop.spec | 4 ++++ kernel-docs.changes | 7 +++++++ kernel-docs.spec | 12 ++++++++---- kernel-docs.spec.in | 8 ++++---- kernel-ec2.changes | 7 +++++++ kernel-ec2.spec | 4 ++++ kernel-net.changes | 7 +++++++ kernel-net.spec | 4 ++++ kernel-pae.changes | 7 +++++++ kernel-pae.spec | 4 ++++ kernel-ppc64.changes | 7 +++++++ kernel-ppc64.spec | 4 ++++ kernel-ps3.changes | 7 +++++++ kernel-ps3.spec | 4 ++++ kernel-s390.changes | 7 +++++++ kernel-s390.spec | 4 ++++ kernel-source.changes | 7 +++++++ kernel-source.spec | 4 ++++ kernel-syms.changes | 7 +++++++ kernel-syms.spec | 4 ++++ kernel-trace.changes | 7 +++++++ kernel-trace.spec | 4 ++++ kernel-vanilla.changes | 7 +++++++ kernel-vanilla.spec | 4 ++++ kernel-vmi.changes | 7 +++++++ kernel-vmi.spec | 4 ++++ kernel-xen.changes | 7 +++++++ kernel-xen.spec | 4 ++++ source-timestamp | 4 ++-- 34 files changed, 186 insertions(+), 10 deletions(-) diff --git a/kernel-debug.changes b/kernel-debug.changes index a3bc090b..fe414296 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 8 17:34:25 CET 2010 - mmarek@suse.cz + +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 + ------------------------------------------------------------------- Tue Dec 7 16:38:29 CET 2010 - jbeulich@novell.com diff --git a/kernel-debug.spec b/kernel-debug.spec index ce74d319..ac90a1d6 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -865,6 +865,10 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Dec 08 2010 mmarek@suse.cz +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 * Tue Dec 07 2010 jbeulich@novell.com - patches.arch/x86_64-unwind-annotations: Remove stringification (needed only with very old assemblers). diff --git a/kernel-default.changes b/kernel-default.changes index a3bc090b..fe414296 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 8 17:34:25 CET 2010 - mmarek@suse.cz + +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 + ------------------------------------------------------------------- Tue Dec 7 16:38:29 CET 2010 - jbeulich@novell.com diff --git a/kernel-default.spec b/kernel-default.spec index 4b4d3894..536c8419 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -878,6 +878,10 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Dec 08 2010 mmarek@suse.cz +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 * Tue Dec 07 2010 jbeulich@novell.com - patches.arch/x86_64-unwind-annotations: Remove stringification (needed only with very old assemblers). diff --git a/kernel-desktop.changes b/kernel-desktop.changes index a3bc090b..fe414296 100644 --- a/kernel-desktop.changes +++ b/kernel-desktop.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 8 17:34:25 CET 2010 - mmarek@suse.cz + +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 + ------------------------------------------------------------------- Tue Dec 7 16:38:29 CET 2010 - jbeulich@novell.com diff --git a/kernel-desktop.spec b/kernel-desktop.spec index b22b8248..0472e33a 100644 --- a/kernel-desktop.spec +++ b/kernel-desktop.spec @@ -898,6 +898,10 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Dec 08 2010 mmarek@suse.cz +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 * Tue Dec 07 2010 jbeulich@novell.com - patches.arch/x86_64-unwind-annotations: Remove stringification (needed only with very old assemblers). diff --git a/kernel-docs.changes b/kernel-docs.changes index a3bc090b..fe414296 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 8 17:34:25 CET 2010 - mmarek@suse.cz + +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 + ------------------------------------------------------------------- Tue Dec 7 16:38:29 CET 2010 - jbeulich@novell.com diff --git a/kernel-docs.spec b/kernel-docs.spec index 08046577..5a376d45 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -31,7 +31,7 @@ Release: rc5. Release: rc5.0 %endif BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel -BuildRequires: kernel-source%variant = %version-%source_rel +BuildRequires: kernel-source%variant Url: http://www.kernel.org/ License: GPL v2 or later Group: Documentation/Man @@ -61,8 +61,8 @@ EOF # use texmf.cnf from local source export TEXMFCNF=$RPM_BUILD_DIR export LANG=en_US -make -C /usr/src/linux-%kernelrelease%variant O=$PWD -k -i mandocs %{?jobs:-j%jobs} -make -C /usr/src/linux-%kernelrelease%variant O=$PWD -k -i pdfdocs %{?jobs:-j%jobs} +make -C /usr/src/linux%variant O=$PWD -k -i mandocs %{?jobs:-j%jobs} +make -C /usr/src/linux%variant O=$PWD -k -i pdfdocs %{?jobs:-j%jobs} %install rm -rf $RPM_BUILD_ROOT @@ -86,7 +86,7 @@ fi ln -s /usr/share/man/man9/request_threaded_irq.9.gz $RPM_BUILD_ROOT/usr/share/man/man9/request_irq.9.gz -cp -a /usr/src/linux-%kernelrelease%variant/{COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} . +cp -a /usr/src/linux%variant/{COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} . %clean rm -rf $RPM_BUILD_ROOT @@ -99,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT /usr/share/doc/kernel %changelog +* Wed Dec 08 2010 mmarek@suse.cz +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 * Tue Dec 07 2010 jbeulich@novell.com - patches.arch/x86_64-unwind-annotations: Remove stringification (needed only with very old assemblers). diff --git a/kernel-docs.spec.in b/kernel-docs.spec.in index 22b401c1..cffff3a7 100644 --- a/kernel-docs.spec.in +++ b/kernel-docs.spec.in @@ -31,7 +31,7 @@ Release: @RELEASE_PREFIX@ Release: @RELEASE_PREFIX@0 %endif BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel -BuildRequires: kernel-source%variant = %version-%source_rel +BuildRequires: kernel-source%variant Url: http://www.kernel.org/ License: GPL v2 or later Group: Documentation/Man @@ -61,8 +61,8 @@ EOF # use texmf.cnf from local source export TEXMFCNF=$RPM_BUILD_DIR export LANG=en_US -make -C /usr/src/linux-%kernelrelease%variant O=$PWD -k -i mandocs %{?jobs:-j%jobs} -make -C /usr/src/linux-%kernelrelease%variant O=$PWD -k -i pdfdocs %{?jobs:-j%jobs} +make -C /usr/src/linux%variant O=$PWD -k -i mandocs %{?jobs:-j%jobs} +make -C /usr/src/linux%variant O=$PWD -k -i pdfdocs %{?jobs:-j%jobs} %install rm -rf $RPM_BUILD_ROOT @@ -86,7 +86,7 @@ fi ln -s /usr/share/man/man9/request_threaded_irq.9.gz $RPM_BUILD_ROOT/usr/share/man/man9/request_irq.9.gz -cp -a /usr/src/linux-%kernelrelease%variant/{COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} . +cp -a /usr/src/linux%variant/{COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} . %clean rm -rf $RPM_BUILD_ROOT diff --git a/kernel-ec2.changes b/kernel-ec2.changes index a3bc090b..fe414296 100644 --- a/kernel-ec2.changes +++ b/kernel-ec2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 8 17:34:25 CET 2010 - mmarek@suse.cz + +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 + ------------------------------------------------------------------- Tue Dec 7 16:38:29 CET 2010 - jbeulich@novell.com diff --git a/kernel-ec2.spec b/kernel-ec2.spec index 2ca5538b..e7677152 100644 --- a/kernel-ec2.spec +++ b/kernel-ec2.spec @@ -868,6 +868,10 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Dec 08 2010 mmarek@suse.cz +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 * Tue Dec 07 2010 jbeulich@novell.com - patches.arch/x86_64-unwind-annotations: Remove stringification (needed only with very old assemblers). diff --git a/kernel-net.changes b/kernel-net.changes index a3bc090b..fe414296 100644 --- a/kernel-net.changes +++ b/kernel-net.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 8 17:34:25 CET 2010 - mmarek@suse.cz + +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 + ------------------------------------------------------------------- Tue Dec 7 16:38:29 CET 2010 - jbeulich@novell.com diff --git a/kernel-net.spec b/kernel-net.spec index 991dd263..d2c3eed6 100644 --- a/kernel-net.spec +++ b/kernel-net.spec @@ -865,6 +865,10 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Dec 08 2010 mmarek@suse.cz +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 * Tue Dec 07 2010 jbeulich@novell.com - patches.arch/x86_64-unwind-annotations: Remove stringification (needed only with very old assemblers). diff --git a/kernel-pae.changes b/kernel-pae.changes index a3bc090b..fe414296 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 8 17:34:25 CET 2010 - mmarek@suse.cz + +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 + ------------------------------------------------------------------- Tue Dec 7 16:38:29 CET 2010 - jbeulich@novell.com diff --git a/kernel-pae.spec b/kernel-pae.spec index be33f5d6..0b8f799d 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -883,6 +883,10 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Dec 08 2010 mmarek@suse.cz +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 * Tue Dec 07 2010 jbeulich@novell.com - patches.arch/x86_64-unwind-annotations: Remove stringification (needed only with very old assemblers). diff --git a/kernel-ppc64.changes b/kernel-ppc64.changes index a3bc090b..fe414296 100644 --- a/kernel-ppc64.changes +++ b/kernel-ppc64.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 8 17:34:25 CET 2010 - mmarek@suse.cz + +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 + ------------------------------------------------------------------- Tue Dec 7 16:38:29 CET 2010 - jbeulich@novell.com diff --git a/kernel-ppc64.spec b/kernel-ppc64.spec index 72e22880..689a030d 100644 --- a/kernel-ppc64.spec +++ b/kernel-ppc64.spec @@ -887,6 +887,10 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Dec 08 2010 mmarek@suse.cz +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 * Tue Dec 07 2010 jbeulich@novell.com - patches.arch/x86_64-unwind-annotations: Remove stringification (needed only with very old assemblers). diff --git a/kernel-ps3.changes b/kernel-ps3.changes index a3bc090b..fe414296 100644 --- a/kernel-ps3.changes +++ b/kernel-ps3.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 8 17:34:25 CET 2010 - mmarek@suse.cz + +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 + ------------------------------------------------------------------- Tue Dec 7 16:38:29 CET 2010 - jbeulich@novell.com diff --git a/kernel-ps3.spec b/kernel-ps3.spec index 4779f4bc..c3c3c22a 100644 --- a/kernel-ps3.spec +++ b/kernel-ps3.spec @@ -868,6 +868,10 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Dec 08 2010 mmarek@suse.cz +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 * Tue Dec 07 2010 jbeulich@novell.com - patches.arch/x86_64-unwind-annotations: Remove stringification (needed only with very old assemblers). diff --git a/kernel-s390.changes b/kernel-s390.changes index a3bc090b..fe414296 100644 --- a/kernel-s390.changes +++ b/kernel-s390.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 8 17:34:25 CET 2010 - mmarek@suse.cz + +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 + ------------------------------------------------------------------- Tue Dec 7 16:38:29 CET 2010 - jbeulich@novell.com diff --git a/kernel-s390.spec b/kernel-s390.spec index ee7284f2..0e6c5c1b 100644 --- a/kernel-s390.spec +++ b/kernel-s390.spec @@ -862,6 +862,10 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Dec 08 2010 mmarek@suse.cz +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 * Tue Dec 07 2010 jbeulich@novell.com - patches.arch/x86_64-unwind-annotations: Remove stringification (needed only with very old assemblers). diff --git a/kernel-source.changes b/kernel-source.changes index a3bc090b..fe414296 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 8 17:34:25 CET 2010 - mmarek@suse.cz + +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 + ------------------------------------------------------------------- Tue Dec 7 16:38:29 CET 2010 - jbeulich@novell.com diff --git a/kernel-source.spec b/kernel-source.spec index ca59b387..8f8aea3f 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -243,6 +243,10 @@ popd %endif %changelog +* Wed Dec 08 2010 mmarek@suse.cz +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 * Tue Dec 07 2010 jbeulich@novell.com - patches.arch/x86_64-unwind-annotations: Remove stringification (needed only with very old assemblers). diff --git a/kernel-syms.changes b/kernel-syms.changes index a3bc090b..fe414296 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 8 17:34:25 CET 2010 - mmarek@suse.cz + +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 + ------------------------------------------------------------------- Tue Dec 7 16:38:29 CET 2010 - jbeulich@novell.com diff --git a/kernel-syms.spec b/kernel-syms.spec index cc5fc806..c064d845 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -81,6 +81,10 @@ install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE %_docdir/%name/README.SUSE %changelog +* Wed Dec 08 2010 mmarek@suse.cz +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 * Tue Dec 07 2010 jbeulich@novell.com - patches.arch/x86_64-unwind-annotations: Remove stringification (needed only with very old assemblers). diff --git a/kernel-trace.changes b/kernel-trace.changes index a3bc090b..fe414296 100644 --- a/kernel-trace.changes +++ b/kernel-trace.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 8 17:34:25 CET 2010 - mmarek@suse.cz + +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 + ------------------------------------------------------------------- Tue Dec 7 16:38:29 CET 2010 - jbeulich@novell.com diff --git a/kernel-trace.spec b/kernel-trace.spec index e014af37..d34207fd 100644 --- a/kernel-trace.spec +++ b/kernel-trace.spec @@ -870,6 +870,10 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Dec 08 2010 mmarek@suse.cz +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 * Tue Dec 07 2010 jbeulich@novell.com - patches.arch/x86_64-unwind-annotations: Remove stringification (needed only with very old assemblers). diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index a3bc090b..fe414296 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 8 17:34:25 CET 2010 - mmarek@suse.cz + +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 + ------------------------------------------------------------------- Tue Dec 7 16:38:29 CET 2010 - jbeulich@novell.com diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index c5f322f0..5a3072d4 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -866,6 +866,10 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Dec 08 2010 mmarek@suse.cz +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 * Tue Dec 07 2010 jbeulich@novell.com - patches.arch/x86_64-unwind-annotations: Remove stringification (needed only with very old assemblers). diff --git a/kernel-vmi.changes b/kernel-vmi.changes index a3bc090b..fe414296 100644 --- a/kernel-vmi.changes +++ b/kernel-vmi.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 8 17:34:25 CET 2010 - mmarek@suse.cz + +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 + ------------------------------------------------------------------- Tue Dec 7 16:38:29 CET 2010 - jbeulich@novell.com diff --git a/kernel-vmi.spec b/kernel-vmi.spec index 9a40cd70..b7da8ef7 100644 --- a/kernel-vmi.spec +++ b/kernel-vmi.spec @@ -862,6 +862,10 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Dec 08 2010 mmarek@suse.cz +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 * Tue Dec 07 2010 jbeulich@novell.com - patches.arch/x86_64-unwind-annotations: Remove stringification (needed only with very old assemblers). diff --git a/kernel-xen.changes b/kernel-xen.changes index a3bc090b..fe414296 100644 --- a/kernel-xen.changes +++ b/kernel-xen.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 8 17:34:25 CET 2010 - mmarek@suse.cz + +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 + ------------------------------------------------------------------- Tue Dec 7 16:38:29 CET 2010 - jbeulich@novell.com diff --git a/kernel-xen.spec b/kernel-xen.spec index 8062f6dd..bb54190c 100644 --- a/kernel-xen.spec +++ b/kernel-xen.spec @@ -868,6 +868,10 @@ Debug information for package %name-devel %files devel-debuginfo -f vmlinux.debug.files %changelog +* Wed Dec 08 2010 mmarek@suse.cz +- rpm/kernel-docs.spec.in: Allow to build against any version of + kernel-source +- commit 37bdc47 * Tue Dec 07 2010 jbeulich@novell.com - patches.arch/x86_64-unwind-annotations: Remove stringification (needed only with very old assemblers). diff --git a/source-timestamp b/source-timestamp index 1f03745f..a0a9349f 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2010-12-07 16:38:29 +0100 -GIT Revision: 987c24495a9ba61ec3622aaf5f756ba8e8befd43 +2010-12-08 17:34:25 +0100 +GIT Revision: 37bdc47e3acbefd88c00c76e5c76600c7787e7eb GIT Branch: master