summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitri Goutnik2017-01-02 12:17:58 -0500
committerDmitri Goutnik2017-01-02 12:17:58 -0500
commit3cee0e86ec17ba00b895e78580b1e0ca1cdd7909 (patch)
treefb9c994ccf25147920633762350848545225b3d6
parent3aa3bdb6191376c05e4bf461ec4a5eedc288e1c1 (diff)
downloadaur-3cee0e86ec17ba00b895e78580b1e0ca1cdd7909.tar.gz
unbreak build, add conflicts
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD9
2 files changed, 7 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b3dd4e4e694b..006214d068e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = encryptpad-git
pkgdesc = Minimalist secure text editor and binary encryptor that implements RFC 4880 Open PGP format
- pkgver = v0.3.2.2.r20.g7d94c7e
+ pkgver = v0.3.2.3.r54.g37062a3
pkgrel = 1
url = https://github.com/evpo/encryptpad
arch = i686
@@ -10,6 +10,7 @@ pkgbase = encryptpad-git
makedepends = python
depends = qt5-base
depends = hicolor-icon-theme
+ conflicts = encryptpad
options = !makeflags
source = encryptpad::git+git://github.com/evpo/EncryptPad.git
source = encryptpad.patch
diff --git a/PKGBUILD b/PKGBUILD
index 71469d216df2..5ccafa29a759 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,18 @@
_pkgname=encryptpad
pkgname=${_pkgname}-git
-pkgver=v0.3.2.2.r20.g7d94c7e
+pkgver=v0.3.2.3.r54.g37062a3
pkgrel=1
pkgdesc="Minimalist secure text editor and binary encryptor that implements RFC 4880 Open PGP format"
arch=(i686 x86_64)
url="https://github.com/evpo/${_pkgname}"
license=('GPL2')
depends=('qt5-base' 'hicolor-icon-theme')
+conflicts=('encryptpad')
makedepends=('git' 'python')
-options=('!makeflags')
source=("${_pkgname}::git+git://github.com/evpo/EncryptPad.git"
- "encryptpad.patch")
+ 'encryptpad.patch')
+options=('!makeflags')
sha1sums=('SKIP'
'fc181153279e6c1167b506a50b4c685475f08bc3')
@@ -34,7 +35,7 @@ build() {
package() {
cd "$srcdir/${_pkgname}"
mkdir -p ${pkgdir}/usr/bin
- install -Dm755 bin/release/encryptcli bin/release/EncryptPad ${pkgdir}/usr/bin/
+ install -Dm755 bin/release/encryptcli bin/release/encryptpad ${pkgdir}/usr/bin/
install -Dm644 ${_pkgname}.desktop ${pkgdir}/usr/share/applications/${_pkgname}.desktop
install -Dm644 ${_pkgname}.xml ${pkgdir}/usr/share/mime/application/${_pkgname}.xml
install -Dm644 images/icns.iconset/icon_16x16.png $pkgdir/usr/share/icons/hicolor/16x16/apps/${_pkgname}.png