summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Burgos2021-04-07 11:50:04 -0600
committerSam Burgos2021-04-07 11:50:04 -0600
commitdf74f3ca130b533b1fcf7085de0b885d99d0f92e (patch)
tree8a464c34c4ecaf56e7e5ad713d86c0b29ccb35ce
parentd2a5d99a59b8a1f24230891b0c07b32a21c4adb7 (diff)
downloadaur-df74f3ca130b533b1fcf7085de0b885d99d0f92e.tar.gz
removed wine-gui-git from conflicts, conflict was fixed
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD6
2 files changed, 3 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f953eb6b285..999dfdb491d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,7 +7,6 @@ pkgbase = wine-installer
license = GPL
depends = wine
depends = winetricks
- conflicts = wine-gui-git
source = wine-installer-5.0.3.tar.xz::http://packages.linuxmint.com/pool/main/w/wine-installer/wine-installer_5.0.3.tar.xz
sha256sums = bef0ddc08fe5143eaca2093221e96af33fdd921d6766d34ee3972476a43f070e
diff --git a/PKGBUILD b/PKGBUILD
index 90d53ed63d4..7b07162981f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,9 +11,9 @@ depends=(
wine
winetricks
)
-conflicts=(
- wine-gui-git
-)
+#conflicts=(
+# wine-gui-git
+#)
source=("${pkgname}-${pkgver}.tar.xz::http://packages.linuxmint.com/pool/main/w/${pkgname}/${pkgname}_${pkgver}.tar.xz")
sha256sums=('bef0ddc08fe5143eaca2093221e96af33fdd921d6766d34ee3972476a43f070e')