summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Blakeney2018-03-28 08:01:19 +1000
committerMark Blakeney2018-03-28 08:01:55 +1000
commit3a5da84e855bd068cf9e7f87220d1ea85f5de2b1 (patch)
treeb6f16f8b102300087e67f5e623aea513ac71b2a4
parent63295c8570bc5b3291d9b13551103ec43d86ac70 (diff)
downloadaur-3a5da84e855bd068cf9e7f87220d1ea85f5de2b1.tar.gz
Add conflict with skype package
The old skype package has now been updated as a copy of this package.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index db51c6bdf54..4a75c936c4c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,10 +14,12 @@ pkgbase = skypeforlinux-stable-bin
depends = nss
optdepends = gnome-keyring
provides = skypeforlinux
+ provides = skype
conflicts = skypeforlinux
conflicts = skypeforlinux-bin
conflicts = skypeforlinux-preview-bin
conflicts = skypeforlinux-beta-bin
+ conflicts = skype
source = https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_8.18.0.6_amd64.deb
sha256sums = 2fc2138c7c6118c3c70576ab593977905463202a7d97fa7111ada0a1c36771a4
diff --git a/PKGBUILD b/PKGBUILD
index 85837a3740f..af863168fc9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,8 +11,8 @@ 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")
-provides=("$_pkgname")
+conflicts=("$_pkgname" "$_pkgname-bin" "$_pkgname-preview-bin" "$_pkgname-beta-bin" "skype")
+provides=("$_pkgname" "skype")
source=("https://repo.skype.com/deb/pool/main/s/$_pkgname/${_pkgname}_${pkgver}_amd64.deb")
sha256sums=('2fc2138c7c6118c3c70576ab593977905463202a7d97fa7111ada0a1c36771a4')