diff options
| author | Kipras Melnikovas | 2019-10-30 01:08:18 +0200 |
|---|---|---|
| committer | Kipras Melnikovas | 2019-10-30 01:08:18 +0200 |
| commit | 5f216131cb0171f1bfd62d8afa73d11752a173ee (patch) | |
| tree | c55e4b648c938ef5b0cd87d7ae5f65b53c483a11 | |
| parent | 2d696a61bb18a0ba25b271014d1a8b1230e57aa9 (diff) | |
| download | aur-5f216131cb0171f1bfd62d8afa73d11752a173ee.tar.gz | |
Remove incorrect conflict of 'git-backup', update version
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | git-backup-git.install (renamed from git-backup.install) | 0 |
3 files changed, 10 insertions, 11 deletions
@@ -1,14 +1,13 @@ pkgbase = git-backup-git pkgdesc = Remote git stash, in case of fire and more! - pkgver = r36.g99c39ef + pkgver = r37.gdd67138 pkgrel = 1 url = https://github.com/sarpik/git-backup - install = git-backup.install + install = git-backup-git.install arch = any license = GPL2 depends = git - provides = git-backup - conflicts = git-backup + provides = git-backup-git source = git+https://github.com/sarpik/git-backup sha256sums = SKIP @@ -2,10 +2,10 @@ pkgname=git-backup-git pkgver() { - cd "$srcdir/${pkgname%-git}" + cd "$srcdir/${pkgname}" printf "r%s.g%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } -pkgver=r36.g99c39ef +pkgver=r37.gdd67138 pkgrel=1 pkgdesc="Remote git stash, in case of fire and more!" @@ -13,23 +13,23 @@ arch=("any") url="https://github.com/sarpik/git-backup" license=("GPL2") -provides=("${pkgname%-git}") -conflicts=("${pkgname%-git}") +provides=("${pkgname}") +# conflicts=("${pkgname%-git}") # git-backup is a different package makedepends=() depends=("git") options=() -install="${pkgname%-git}.install" +install="${pkgname}.install" #changelog= source=("git+$url") sha256sums=("SKIP") package() { - cd "$srcdir/${pkgname%-git}" + cd "$srcdir/${pkgname}" make DESTDIR="$pkgdir" -s install - install -Dm644 -t "$pkgdir/usr/share/doc/${pkgname%-git}/" README.md + install -Dm644 -t "$pkgdir/usr/share/doc/${pkgname}/" README.md } # vim: ts=2 sw=2 et ft=PKGBUILD: diff --git a/git-backup.install b/git-backup-git.install index 5543fa2636b1..5543fa2636b1 100644 --- a/git-backup.install +++ b/git-backup-git.install |