From c675e2db6b98cceb2f4057fb522c56bb19d4a400 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Feb 28 2012 16:52:27 +0000
Subject: Linux v3.3-rc5-88-g586c6e7


---

diff --git a/kernel.spec b/kernel.spec
index 5babfd3..6b000a2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,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 2
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -87,7 +87,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 5
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -2374,6 +2374,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Tue Feb 28 2012 Dave Jones <davej@redhat.com> - 3.3.0-0.rc5.git2.1
+- Linux v3.3-rc5-88-g586c6e7
+
 * Mon Feb 27 2012 Josh Boyer <jwboyer@redhat.com>
 - Add patch to fix regression in FADT revision checks (rhbz 730007 727865)
 
diff --git a/scripts/generate-git-snapshot.sh b/scripts/generate-git-snapshot.sh
new file mode 100755
index 0000000..7fbc141
--- /dev/null
+++ b/scripts/generate-git-snapshot.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# Set LINUX_GIT to point to an upstream Linux git tree in your .bashrc or wherever.
+#
+# TODO: Generate the gitN number.
+#
+
+VER=$(grep patch sources | head -n1 | awk '{ print $2 }' | sed s/patch-// | sed s/.xz//)
+
+OLDGIT=$(grep gitrev kernel.spec | head -n1 | sed s/%define\ gitrev\ //)
+export NEWGIT=$(($OLDGIT+1))
+
+pushd $LINUX_GIT
+
+git diff v$VER.. > /tmp/patch-$VER-git$NEWGIT
+xz -9 /tmp/patch-$VER-git$NEWGIT
+DESC=$(git describe)
+popd
+
+mv /tmp/patch-$VER-git$NEWGIT.xz .
+
+perl -p -i -e 's|%global baserelease.*|%global baserelease 0|' kernel.spec
+
+perl -p -i -e 's|%define gitrev.*|%define gitrev $ENV{'NEWGIT'}|' kernel.spec
+
+rpmdev-bumpspec -c "Linux $DESC" kernel.spec
diff --git a/sources b/sources
index 79a110b..8d4050e 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 364066fa18767ec0ae5f4e4abcf9dc51  linux-3.2.tar.xz
 19b5b3b5529c1d70463cf1db5177047d  patch-3.3-rc5.xz
 02c210a8fd24acca8c1ac93f6f1d3913  compat-wireless-2012-02-05.tar.bz2
-10b44f8086350d573346b6c3d51a63e0  patch-3.3-rc5-git1.xz
+915adf42637fc2fa08f11565fadef1fc  patch-3.3-rc5-git2.xz