Merge pull request #21 from manjaro-sway/upstream_master

added conflicts

.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = swaylock-effects
 	pkgdesc = A fancier screen locker for Wayland.
 	pkgver = 1.7.0.0
-	pkgrel = 2
+	pkgrel = 4
 	url = https://github.com/jirutka/swaylock-effects
 	arch = i686
 	arch = x86_64
@@ -18,6 +18,8 @@ pkgbase = swaylock-effects
 	depends = gdk-pixbuf2
 	depends = pam
 	provides = swaylock
+	conflicts = swaylock
+	backup = etc/pam.d/swaylock
 	source = https://github.com/jirutka/swaylock-effects/archive/v1.7.0.0.tar.gz
 	sha256sums = e94d79e189602694bedfbafb553ce3c6c976426e16f76d93bf7e226dc2876eb6
 

PKGBUILD

@@ -2,14 +2,16 @@
 
 pkgname=swaylock-effects
 pkgver=1.7.0.0
-pkgrel=2
+pkgrel=4
 pkgdesc="A fancier screen locker for Wayland."
 arch=('i686' 'x86_64' 'aarch64')
 url="https://github.com/jirutka/$pkgname"
 license=('MIT')
 depends=('libxkbcommon' 'cairo' 'gdk-pixbuf2' 'pam')
 makedepends=('git' 'meson' 'ninja' 'scdoc' 'wayland' 'wayland-protocols')
 provides=('swaylock')
+conflicts=('swaylock')
+backup=('etc/pam.d/swaylock')
 source=("$url/archive/v$pkgver.tar.gz")
 sha256sums=('e94d79e189602694bedfbafb553ce3c6c976426e16f76d93bf7e226dc2876eb6')