summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidney Crestani2016-12-05 21:13:37 -0200
committerSidney Crestani2016-12-05 21:13:37 -0200
commit26032af1090cb9d8cd56d2f8f599e7683c6728da (patch)
tree26e45635013f76e1febac817379a2595cda854df
parentc63c146b2314c508de677a2cbcf7041449328e62 (diff)
downloadaur-26032af1090cb9d8cd56d2f8f599e7683c6728da.tar.gz
Fix wrong placement
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
2 files changed, 6 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a7de778129d0..44b065bb2583 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = wine-git
pkgdesc = A compatibility layer for running Windows programs. GIT version.
pkgver = 1.9.24.r105.g1d3b944
- pkgrel = 2
+ pkgrel = 3
url = http://www.winehq.com
arch = i686
arch = x86_64
@@ -120,8 +120,10 @@ pkgbase = wine-git
optdepends = samba
optdepends = dosbox
provides = bin32-wine=1.9.24.r105.g1d3b944
+ provides = wine=1.9.24.r105.g1d3b944
provides = wine-wow64=1.9.24.r105.g1d3b944
conflicts = bin32-wine
+ conflicts = wine
conflicts = wine-wow64
replaces = bin32-wine
options = staticlibs
diff --git a/PKGBUILD b/PKGBUILD
index c0615308a231..23bbf84805d0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,14 +5,12 @@
pkgname=wine-git
_gitname="wine"
pkgver=1.9.24.r105.g1d3b944
-pkgrel=2
+pkgrel=3
pkgdesc="A compatibility layer for running Windows programs. GIT version."
url="http://www.winehq.com"
arch=('i686' 'x86_64')
options=(staticlibs)
license=(LGPL)
-conflicts=('wine')
-provides=('wine')
source=('wine-git::git://source.winehq.org/git/wine.git'
'30-win32-aliases.conf')
md5sums=('SKIP'
@@ -92,8 +90,8 @@ if [[ $CARCH == i686 ]]; then
optdepends=(${optdepends[@]/*32-*/})
else
makedepends=(${makedepends[@]} ${_depends[@]})
- provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver")
- conflicts=('bin32-wine' 'wine-wow64')
+ provides=("bin32-wine=$pkgver" "wine=$pkgver" "wine-wow64=$pkgver")
+ conflicts=('bin32-wine' 'wine' 'wine-wow64')
replaces=('bin32-wine')
fi