summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2017-10-10 17:26:00 -0300
committerDaniel Bermond2017-10-10 17:26:00 -0300
commit746bdb75fb07f01d62bf8aa7934ffa6ccbaf583a (patch)
treeaf110e3cf4fd9c45efe678999893c676f9902d91
parent767b604ced0a27e0be7b647686956def510128aa (diff)
downloadaur-746bdb75fb07f01d62bf8aa7934ffa6ccbaf583a.tar.gz
Fix provides and conflicts
i686: added provides and conflicts (missing) x86_64: added wine, wine-staging and wine-staging-git to conflicts Cosmetic changes to x86_64 provides.
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD10
2 files changed, 15 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7a5d5a143b6..228f06e4b8b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Oct 10 19:05:29 UTC 2017
+# Tue Oct 10 20:25:27 UTC 2017
pkgbase = wine-git
pkgdesc = A compatibility layer for running Windows programs (git version)
- pkgver = 2.1.r285.gd00f7315e0
- pkgrel = 4
+ pkgver = 2.18.r144.gee7ddd1ed3
+ pkgrel = 1
url = https://www.winehq.org
arch = i686
arch = x86_64
@@ -121,11 +121,13 @@ pkgbase = wine-git
optdepends = cups
optdepends = samba
optdepends = dosbox
- provides = bin32-wine=2.1.r285.gd00f7315e0
- provides = wine=2.1.r285.gd00f7315e0
- provides = wine-wow64=2.1.r285.gd00f7315e0
- conflicts = bin32-wine
+ provides = wine=2.18.r144.gee7ddd1ed3
+ provides = bin32-wine=2.18.r144.gee7ddd1ed3
+ provides = wine-wow64=2.18.r144.gee7ddd1ed3
conflicts = wine
+ conflicts = wine-staging
+ conflicts = wine-staging-git
+ conflicts = bin32-wine
conflicts = wine-wow64
replaces = bin32-wine
options = staticlibs
diff --git a/PKGBUILD b/PKGBUILD
index 31cc20d9dfe..7b5f02940dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
# Contributor: sxe <sxxe@gmx.de>
pkgname=wine-git
-pkgver=2.1.r285.gd00f7315e0
-pkgrel=4
+pkgver=2.18.r144.gee7ddd1ed3
+pkgrel=1
pkgdesc='A compatibility layer for running Windows programs (git version)'
arch=('i686' 'x86_64')
url='https://www.winehq.org'
@@ -84,10 +84,12 @@ then
makedepends=(${makedepends[@]/*32-*/} ${_depends[@]})
makedepends=(${makedepends[@]/*-multilib*/})
optdepends=(${optdepends[@]/*32-*/})
+ provides=("wine=${pkgver}")
+ conflicts=('wine' 'wine-staging' 'wine-staging-git')
else
makedepends=(${makedepends[@]} ${_depends[@]})
- provides=("bin32-wine=$pkgver" "wine=$pkgver" "wine-wow64=$pkgver")
- conflicts=('bin32-wine' 'wine' 'wine-wow64')
+ provides=("wine=${pkgver}" "bin32-wine=${pkgver}" "wine-wow64=${pkgver}")
+ conflicts=('wine' 'wine-staging' 'wine-staging-git' 'bin32-wine' 'wine-wow64')
replaces=('bin32-wine')
fi