Patch: move power-x86-destdir.patch to a section where it is applied even for vanilla builds

[Thorsten Leemhuis]

Hi!

Patch got stripped, hence now inlined -- hopefully it's not whitespace 
damaged or something like that... 

Cu
thl

On 20.10.2012 20:33, Thorsten Leemhuis wrote:
> Hi!
> 
> power-x86-destdir.patch should be applied always, as building the Fedora
> spec file with the switch "--with vanilla" will fail otherwise. Attached
> patch fixes that for rawhide.
> 
> BTW: is that patch heading upstream?
> 
> While at it: Is it really a good idea to put the definitions for Fedora
> specific patches in a section with a "%if !%{nopatches}" conditional? If
> someone grabs the SRPM from a vanilla build then he can't properly
> recompile it without using "--with vanilla", as the SRPM misses the
> patches for a proper Fedora build. Sure, that's a corner case, but the
> space saving from omitting the patches are not that big, so I was
> wondering if this "%if !%{nopatches}" conditional is better removed, as
> it's not worth the trouble.


diff --git a/kernel.spec b/kernel.spec
index 520615e..a82e412 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -645,6 +645,8 @@ Patch04: linux-2.6-compile-fixes.patch
 # build tweak for build ID magic, even for -vanilla
 Patch05: linux-2.6-makefile-after_link.patch
 
+Patch21094: power-x86-destdir.patch
+
 %if !%{nopatches}
 
 
@@ -739,8 +741,6 @@ Patch21006: arm-tegra-sdhci-module-fix.patch
 # ARM highbank patches
 Patch21010: arm-highbank-sata-fix.patch
 
-Patch21094: power-x86-destdir.patch
-
 #rhbz 754518
 Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
 
@@ -1309,6 +1309,8 @@ ApplyPatch linux-2.6-makefile-after_link.patch
 # misc small stuff to make things compile
 #
 ApplyOptionalPatch linux-2.6-compile-fixes.patch
+ApplyPatch power-x86-destdir.patch
+
 
 %if !%{nopatches}
 
@@ -1442,8 +1444,6 @@ ApplyPatch lis3-improve-handling-of-null-rate.patch
 
 ApplyPatch i82975x-edac-fix.patch
 
-ApplyPatch power-x86-destdir.patch
-
 #rhbz 754518
 ApplyPatch scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
 
@@ -2311,6 +2311,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Sat Oct 20 2012 Thorsten Leemhuis <fedora at leemhuis.info> - 3.7.0-0.rc1.git3.2
+- move power-x86-destdir.patch to a section where it is applied 
+  even for vanilla builds
+
 * Fri Oct 19 2012 Justin M. Forbes <jforbes at redhat.com> - 3.7.0-0.rc1.git3.1
 - Linux v3.7-rc1-154-gc9623de