summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Zou2015-12-11 21:27:11 +0100
committerMichel Zou2015-12-11 21:27:11 +0100
commitdb69e681ee36aec36bd43ed4ff69997407db0d0b (patch)
tree85700cb374c75e5e189eaee602f0690ddf6c500f
parent24e220f199177f00155ac59b877b87332688aa43 (diff)
downloadaur-mingw-w64-python26-bin.tar.gz
Revert "conficts mingw-w64-python2"
This reverts commit 24e220f199177f00155ac59b877b87332688aa43.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 0 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a8397b2fd97..633ab29aba3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,8 +9,6 @@ pkgbase = mingw-w64-python26-bin
makedepends = mingw-w64-tools
makedepends = mingw-w64-binutils
depends = mingw-w64-crt
- provides = mingw-w64-python2
- conflicts = mingw-w64-python2
options = staticlibs
options = !buildflags
options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index aa2c6084078..0dc1b6c7b4a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,6 @@ pkgdesc="A high-level scripting language (native MSVC version) (mingw-w64)"
arch=('any')
license=('PSF')
url="http://www.python.org/"
-provides=('mingw-w64-python2')
-conflicts=('mingw-w64-python2')
depends=('mingw-w64-crt')
makedepends=('wine' 'mingw-w64-tools' 'mingw-w64-binutils')
options=('staticlibs' '!buildflags' '!strip')