summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Blakeney2018-01-11 14:24:10 +1000
committerMark Blakeney2018-01-11 14:24:10 +1000
commitbae5b55fea3616c9dcaa0dcb86df0ef8223ddd07 (patch)
tree7f85d5719eadbf47655e8c26d5b84b113bbdf22f
parent2205204c96365bd1ac1b9e53588f076dd08e5b36 (diff)
downloadaur-bae5b55fea3616c9dcaa0dcb86df0ef8223ddd07.tar.gz
Fix up package conflicts
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8612ff590cb..0219f196111 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = skypeforlinux-stable-bin
pkgdesc = Skype for Linux - Stable/Release Version
pkgver = 8.13.0.2
- pkgrel = 1
+ pkgrel = 2
url = http://www.skype.com
arch = x86_64
license = custom
@@ -16,8 +16,8 @@ pkgbase = skypeforlinux-stable-bin
provides = skypeforlinux
conflicts = skypeforlinux
conflicts = skypeforlinux-bin
- conflicts = skypeforlinux-stable-bin-preview-bin
- conflicts = skypeforlinux-stable-bin-beta-bin
+ conflicts = skypeforlinux-preview-bin
+ conflicts = skypeforlinux-beta-bin
source = https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_8.13.0.2_amd64.deb
sha256sums = c931f4a30e5bf34e74393e0eb38190811dcef25e8598a786c4a97387bcd9e196
diff --git a/PKGBUILD b/PKGBUILD
index 88a0dc2ef46..cd9641c0c06 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,14 @@
_pkgname=skypeforlinux
pkgname=$_pkgname-stable-bin
pkgver=8.13.0.2
-pkgrel=1
+pkgrel=2
pkgdesc="Skype for Linux - Stable/Release Version"
arch=("x86_64")
url="http://www.skype.com"
license=("custom")
depends=("gtk2" "libxss" "gconf" "alsa-lib" "libxtst" "libsecret" "nss")
optdepends=("gnome-keyring")
-conflicts=("$_pkgname" "$_pkgname-bin" "$pkgname-preview-bin" "$pkgname-beta-bin")
+conflicts=("$_pkgname" "$_pkgname-bin" "$_pkgname-preview-bin" "$_pkgname-beta-bin")
provides=("$_pkgname")
source=("https://repo.skype.com/deb/pool/main/s/$_pkgname/${_pkgname}_${pkgver}_amd64.deb")
sha256sums=('c931f4a30e5bf34e74393e0eb38190811dcef25e8598a786c4a97387bcd9e196')