diff options
author | Lars Johnsen | 2015-02-24 22:28:55 +0100 |
---|---|---|
committer | Lars Johnsen | 2015-02-24 22:36:21 +0100 |
commit | 408a397cb2988487b07a402c984163ff47191fde (patch) | |
tree | b3deac590cb824dd9f135c299db22006a518fd80 | |
parent | 027a91ff1dd2545cfa4cd7a3dddff5abeac26f7d (diff) | |
download | aur-408a397cb2988487b07a402c984163ff47191fde.tar.gz |
Patch has been merged
-rw-r--r-- | .SRCINFO | 4 | ||||
-rwxr-xr-x | PKGBUILD | 14 |
2 files changed, 3 insertions, 15 deletions
@@ -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 @@ -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}" |