summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Richter2019-08-29 00:12:55 +0200
committerMarkus Richter2019-08-29 00:12:55 +0200
commitcd5743c12657c4da86b663a04b66edf071877205 (patch)
treec38062146ed4ae1fa37f82e0060cf4101ba2c37d
parent3653b5b0b43a8919a4e4dd08dd2a341b47a3460e (diff)
downloadaur-cd5743c12657c4da86b663a04b66edf071877205.tar.gz
fit to upstream, add -mysql to conflicts array
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 87cb9b8e67ce..76321ca6d96a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = bitwarden_rs-git
pkgdesc = An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Does NOT include the web-interface.
- pkgver = 1.6.1.r18.g82f828a
+ pkgver = 1.10.0.r12.g469318b
pkgrel = 1
url = https://github.com/dani-garcia/bitwarden_rs
install = bitwarden_rs.install
@@ -14,6 +14,7 @@ pkgbase = bitwarden_rs-git
depends = openssl
provides = bitwarden_rs
conflicts = bitwarden_rs
+ conflicts = bitwarden_rs-mysql
backup = etc/bitwarden_rs.env
source = git+https://github.com/dani-garcia/bitwarden_rs.git
source = bitwarden_rs.install
diff --git a/PKGBUILD b/PKGBUILD
index 8ebf8768cfa6..a73eef2ccc23 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=bitwarden_rs-git
_pkgbase=bitwarden_rs
-pkgver=1.6.1.r18.g82f828a
+pkgver=1.10.0.r12.g469318b
pkgrel=1
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')
@@ -12,7 +12,7 @@ groups=()
makedepends=('rust-nightly' 'cargo-nightly')
depends=('openssl')
provides=("$_pkgbase")
-conflicts=("$_pkgbase")
+conflicts=("$_pkgbase" "$_pkgbase-mysql")
replaces=()
backup=('etc/bitwarden_rs.env')
options=()
@@ -40,7 +40,7 @@ build() {
#build bitwarden_rs
cd "$srcdir/$_pkgbase"
patch -N -p1 -i "$srcdir/0001-Disable-Vault.patch"
- cargo build --release
+ cargo build --release --features sqlite
}
package() {