diff --git a/.gitignore b/.gitignore
index f862ef4..b59e266 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/kernel-rt-3.10.0-229.rt56.141.el7.tar.xz
+SOURCES/kernel-rt-3.10.0-229.1.2.rt56.141.2.tar.xz
SOURCES/rheldup3.x509
SOURCES/rhelkpatch1.x509
diff --git a/.kernel-rt.metadata b/.kernel-rt.metadata
index f2dd626..991ba42 100644
--- a/.kernel-rt.metadata
+++ b/.kernel-rt.metadata
@@ -1,3 +1,3 @@
-4e3456c279ce6fa73c887250dc712064876a91a5 SOURCES/kernel-rt-3.10.0-229.rt56.141.el7.tar.xz
+bc912da1cc9c7ea1719219ebf39d0f1ba4baea0a SOURCES/kernel-rt-3.10.0-229.1.2.rt56.141.2.tar.xz
95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509
d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index ae045ab..6192c1f 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -8,18 +8,17 @@ Summary: The Linux Realtime kernel
%global __spec_install_pre %{___build_pre}
# realtimeN
-%global iteration 141
-
-# major and minor kernel version
-# e.g. 3.2.4 has a major_kver of 3 and a minor_kver of 2
-%global major_kver 3
-%global minor_kver 10.0
+%global rtbuild 141.2
# RHEL7 build number
-%global rhel_build %{!?_rhel_build:229}
+%global rhel_build 229.1.2
# The preempt RT patch level
-%global rttag %{!?rt_patch_version:rt56}
+%global rttag rt56
+
+# For a kernel released for public testing, released_kernel should be 1.
+# For internal testing builds during development, it should be 0.
+%global released_kernel 0
# conditional with/without variables
# Note that the logic here is inverted; a bcond_without implies
@@ -95,7 +94,7 @@ Summary: The Linux Realtime kernel
# if patch fuzzy patch applying will be forbidden
%global with_fuzzy_patches 0
-%global rpmversion %{major_kver}.%{minor_kver}
+%global rpmversion 3.10.0
# What parts do we want to build? We must build at least one kernel.
@@ -123,14 +122,14 @@ Summary: The Linux Realtime kernel
# should we do C=1 builds with sparse
%global with_sparse %{?_with_sparse: 1} %{?!_with_sparse: 0}
-%global pkg_release_simple %{rhel_build}.%{rttag}.%{iteration}
+%global pkg_release_simple %{rhel_build}.%{rttag}.%{rtbuild}
+
+%global pkg_release %{pkg_release_simple}%{?dist}%{?buildid}
-%global pkg_release %{pkg_release_simple}%{?buildid}%{?dist}
-%global pkg_release_simple %{pkg_release_simple}%{?dist}
%global KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
# The kernel tarball/base version
-%global kversion %{major_kver}.%{minor_kver}
+%global kversion %{rpmversion}
%global make_target bzImage
@@ -1439,6 +1438,15 @@ fi
%endif
%changelog
+* Mon Mar 23 2015 Clark Williams <williams@redhat.com> [3.10.0-229.1.2.rt56.141.2.el7]
+- [rt] rebase to 1.2 zstream (Clark Williams) [1200897]
+
+* Wed Mar 18 2015 Clark Williams <williams@redhat.com> [3.10.0-229.1.1.rt56.141.1.el7]
+- [rt] rebase to 1.1 zstream branch and update build mechanism (Clark Williams) [1200897]
+- sunrpc: don't wait for write before allowing reads from use-gss-proxy file (Jeff Layton)
+- netfilter: fix up incorrect type passed to xt_register_match (Clark Williams)
+- Revert "netfilter: xt_connlimit: remove revision 0" (John Kacur)
+
* Wed Feb 11 2015 Clark Williams <williams@redhat.com> [3.10.0-229.rt56.141]
- [rt] mce: fixed RHEL-RT mis-merge with mce cleanup commit [1191668]