From 9859dce83610a6c679cabd340b2d0e6a91ce87b8 Mon Sep 17 00:00:00 2001
From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Sat, 2 Feb 2008 09:51:19 +0000
Subject: [PATCH] Really minor fixes/cleanups.

---
 Makefile        | 2 +-
 kernel-2.6.spec | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index edc5038e1..e4239cb38 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ AWK	= awk
 MD5SUM	= md5sum
 SED	= sed
 
-SPECFILE = kernel-2.6-planetlab.spec
+SPECFILE = kernel-2.6.spec
 
 # Thierry - when called from within the build, PWD is /build
 PWD=$(shell pwd)
diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 867838934..857ebe5f0 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -320,7 +320,7 @@ KERNEL_PREVIOUS=vanilla
   KERNEL_PREVIOUS=linux-%{kversion}-%1
 
 # This is where the patches get applied
-%if "0%{patchlevel}"
+%if 0%{?patchlevel}
 %ApplyPatch 0
 %endif
 
@@ -356,7 +356,7 @@ KERNEL_PREVIOUS=vanilla
 %endif
 
 # Run the mac80211 stuff in the kernel tree holding the last patch
-tar -xzf %{expand:%{PATCH600}}
+tar -xzf %{PATCH600}
 pushd mac80211-%{mac80211_version}
 mac80211_makeflags="KSRC=../$KERNEL_PREVIOUS"
 make $mac80211_makeflags modified
@@ -365,7 +365,7 @@ make $mac80211_makeflags patch_kernel
 popd
 
 # Untar iwlwifi in the same place - needs to be compiled later
-tar -xzf %{expand:%{PATCH601}}
+tar -xzf %{PATCH601}
 # the install target is broken: first it does not pass the right -b flag to depmod
 # second we do not need to invoke depmod at this stage anyway
 # let's add our own patch/stuff in this Makefile for manual install later on
-- 
2.43.0