summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph2020-01-01 17:00:35 +0100
committerChristoph2020-01-01 17:00:35 +0100
commit62bd4444ac01429a70d35a52c4515141a631068e (patch)
tree4d4909c9d70fa1fc99825451dc9dac9d4e8f5c65
parentacb49f5c7262fb8959482ea7d650a9c59a2f1b43 (diff)
downloadaur-ferdi-git.tar.gz
update version number and conflicting packages
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e2ce317c046..503ebb1d248 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ferdi-git
pkgdesc = Ferdi is a messaging browser that allows you to combine your favorite messaging services into one application.
- pkgver = 5.4.0
+ pkgver = 5.4.1
pkgrel = 1
url = https://getferdi.com/
arch = x86_64
@@ -12,6 +12,7 @@ pkgbase = ferdi-git
makedepends = python2
depends = electron
conflicts = ferdi
+ conflicts = ferdi-bin
source = git://github.com/getferdi/ferdi.git
source = git://github.com/getferdi/recipes.git
source = ferdi.desktop
diff --git a/PKGBUILD b/PKGBUILD
index 8b3bf887227..dae728119f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,14 @@
# Contributor: Pieter Goetschalckx <3.14.e.ter <at> gmail <dot> com>
pkgname=ferdi-git
-_pkgver=5.4.0
+_pkgver=5.4.1
pkgver=${_pkgver//-/_}
pkgrel=1
pkgdesc='Ferdi is a messaging browser that allows you to combine your favorite messaging services into one application.'
arch=(x86_64 i686)
url='https://getferdi.com/'
license=(Apache)
-conflicts=('ferdi')
+conflicts=('ferdi' 'ferdi-bin')
depends=(electron)
makedepends=(expac git npm python2)
source=('git://github.com/getferdi/ferdi.git'
@@ -44,7 +44,7 @@ prepare() {
src/index.js
# Adjust node-sass version to avoid build issues
- npm install "node-sass@4.12.0"
+ npm install "node-sass@4.13.0"
}
build() {