summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Richter2019-08-28 23:25:14 +0200
committerMarkus Richter2019-08-28 23:28:03 +0200
commit986abc073d016c6acbc69b085c4a150e9012386a (patch)
tree6523902949099a6be38afdb5832227d310053c02
parent40861a5d95d87700935f848deebdbe2e41a657e8 (diff)
downloadaur-986abc073d016c6acbc69b085c4a150e9012386a.tar.gz
add -mysql package to conflicts
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ca524f383733..76ab58596ec1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = bitwarden_rs
pkgdesc = An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Does NOT include the web-interface.
pkgver = 1.10.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/dani-garcia/bitwarden_rs
install = bitwarden_rs.install
arch = i686
@@ -14,6 +14,7 @@ pkgbase = bitwarden_rs
depends = openssl
optdepends = bitwarden_rs-vault: Web Interface 'Vault'
conflicts = bitwarden_rs-git
+ conflicts = bitwarden_rs-mysql
backup = etc/bitwarden_rs.env
source = https://github.com/dani-garcia/bitwarden_rs/archive/1.10.0.tar.gz
source = bitwarden_rs.install
diff --git a/PKGBUILD b/PKGBUILD
index ad1bbdfdff34..6ebce1af77f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=bitwarden_rs
_pkgbase=bitwarden_rs
pkgver=1.10.0
-pkgrel=1
+pkgrel=2
pkgdesc="An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Does NOT include the web-interface."
arch=('i686' 'x86_64' 'armv7h' 'aarch64')
url="https://github.com/dani-garcia/bitwarden_rs"
@@ -11,7 +11,7 @@ license=('GPL3')
depends=('openssl')
makedepends=('rust-nightly' 'cargo-nightly')
optdepends=("bitwarden_rs-vault: Web Interface 'Vault'")
-conflicts=("${_pkgbase}-git")
+conflicts=("${_pkgbase}-git" "${_pkgbase}-mysql")
backup=('etc/bitwarden_rs.env')
install=bitwarden_rs.install
source=("https://github.com/dani-garcia/bitwarden_rs/archive/$pkgver.tar.gz"