summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Schwartz2015-04-30 01:51:34 -0500
committerEli Schwartz2015-06-09 01:22:10 -0500
commit62675d761887e2ca30a95e5796ba2e54ad766efd (patch)
treef5d177fc4c1d66b5f190f10f83a82124fc25db33
parent95f0cedb3acc9ac2cc3256efd669c95a5adc33bd (diff)
downloadaur-62675d761887e2ca30a95e5796ba2e54ad766efd.tar.gz
upgpkg: fanficfare-git 2.2.4.r0.g3d07257-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 5d00ec798e49..b226ab4dca00 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = fanficfare-git
pkgdesc = A tool for downloading fanfiction to eBook formats
pkgver = 2.2.4.r0.g3d07257
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/JimmXinu/FanFicFare
arch = any
license = Apache
@@ -11,6 +11,7 @@ pkgbase = fanficfare-git
depends = python2-chardet
depends = python2-html5lib
provides = fanficfare
+ conflicts = fanficfare
source = git://github.com/JimmXinu/FanFicFare
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index d363001f0751..aed8c225db9e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=FanFicFare
pkgname=fanficfare-git
pkgver=2.2.4.r0.g3d07257
-pkgrel=1
+pkgrel=2
pkgdesc="A tool for downloading fanfiction to eBook formats"
arch=('any')
url="https://github.com/JimmXinu/${_pkgname}"
@@ -11,6 +11,7 @@ license=('Apache')
depends=('python2' 'python2-beautifulsoup4' 'python2-chardet' 'python2-html5lib')
makedepends=('git')
provides=('fanficfare')
+conflicts=('fanficfare')
source=("git://github.com/JimmXinu/${_pkgname}")
sha256sums=('SKIP')