summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Schwartz2015-04-30 01:52:10 -0500
committerEli Schwartz2015-06-09 01:22:13 -0500
commit0f26b46e1f198eb0e66eae49b6c5daf26fd73ede (patch)
tree32e5d8cbd1c290544746af495eee4558ebaf45c8
parent97ba63ac3f6b5be08a31b83d91d7e038074c8fe3 (diff)
downloadaur-0f26b46e1f198eb0e66eae49b6c5daf26fd73ede.tar.gz
upgpkg: kindletool-git 1.6.3.r24.g6a3a3e5-2
conflict with non-git package
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 28ad5d6a5235..aca6f81cac48 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = kindletool-git
pkgdesc = Tool for creating/extracting Kindle updates and more
pkgver = 1.6.3.r24.g6a3a3e5
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/NiLuJe/KindleTool
arch = i686
arch = x86_64
@@ -10,6 +10,7 @@ pkgbase = kindletool-git
depends = libarchive
depends = nettle
provides = kindletool
+ conflicts = kindletool
source = git://github.com/NiLuJe/KindleTool.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 8b950de48534..9f7446a7c2e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_gitname=KindleTool
pkgname=kindletool-git
pkgver=1.6.3.r24.g6a3a3e5
-pkgrel=1
+pkgrel=2
pkgdesc="Tool for creating/extracting Kindle updates and more"
arch=('i686' 'x86_64')
url="https://github.com/NiLuJe/${_gitname}"
@@ -11,6 +11,7 @@ license=('GPL')
depends=('libarchive' 'nettle')
makedepends=('git')
provides=('kindletool')
+conflicts=('kindletool')
source=("git://github.com/NiLuJe/${_gitname}.git")
sha256sums=('SKIP')