Patch has been merged

2 files changed, 3 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e19e9fae818e..35758cda5960 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by makepkg 4.2.1
-# Mon Feb 23 00:46:00 UTC 2015
+# Tue Feb 24 21:35:59 UTC 2015
 pkgbase = sonarr-git
 	pkgdesc = Smart PVR for newsgroup and bittorrent users
-	pkgver = 2.0.0.r6032
+	pkgver = 2.0.0.r6043
 	pkgrel = 1
 	url = https://sonarr.tv
 	install = sonarr.install
diff --git a/PKGBUILD b/PKGBUILD
index 3fe1b26d1d48..f07d32279d6a 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@ _gitname="Sonarr"
 _gitver="2.0.0"
 _gitbranch="develop"
 pkgname="sonarr-git"
-pkgver=2.0.0.r6032
+pkgver=2.0.0.r6043
 pkgrel=1
 pkgdesc="Smart PVR for newsgroup and bittorrent users"
 arch=(any)
@@ -30,18 +30,6 @@ pkgver() {
   printf "${_gitver}.r%s" "$(git rev-list --count HEAD)"
 }
 
-prepare() {
-  cd "${_gitname}"
-
-  # XXX Git for some reason complains if identity is not already set
-  git config user.email "you@example.com"
-  git config user.name "Your Name"
-
-  msg2 "Rebasing using pull request (https://github.com/Sonarr/Sonarr/pull/202)"
-  git fetch origin pull/202/head:XBuild-support
-  git rebase --onto XBuild-support "origin/${_gitbranch}" --force-rebase --ignore-whitespace
-}
-
 build() {
   cd "${_gitname}"