diff options
| author | Daniel Maslowski | 2016-11-26 02:19:33 +0100 |
|---|---|---|
| committer | Daniel Maslowski | 2016-11-26 02:19:33 +0100 |
| commit | 496ec7304a8cbac44526effe571a3928854fd56b (patch) | |
| tree | 52b2487facf78a41c2a8953bf86664cc5dfea7a9 | |
| parent | d15f415726a78a5eef8b65eba73e7b2c4e5db02e (diff) | |
| download | aur-496ec7304a8cbac44526effe571a3928854fd56b.tar.gz | |
add conflict with git version
remove obsolete patch
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | activate.py.patch | 6 |
3 files changed, 5 insertions, 16 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Nov 25 13:09:46 UTC 2016 +# Sat Nov 26 01:18:51 UTC 2016 pkgbase = python-conda pkgdesc = OS-agnostic, system-level binary package manager and ecosystem pkgver = 4.2.12 - pkgrel = 1 + pkgrel = 2 url = http://conda.pydata.org/docs/ arch = any license = BSD @@ -15,6 +15,7 @@ pkgbase = python-conda provides = conda provides = activate provides = deactivate + conflicts = python-conda-git options = !emptydirs source = https://github.com/conda/conda/archive/4.2.12.tar.gz sha512sums = bc5c85fa0c6824e4e9ee29ad57331f0e342905be84ee450643644e4a71c3bb77b500e4c505643e32ebd12f07b5b03de6603ac9e2f156cd64b3758ea440a3d399 @@ -3,23 +3,18 @@ _pyname=conda pkgname=python-conda pkgver=4.2.12 -pkgrel=1 +pkgrel=2 pkgdesc="OS-agnostic, system-level binary package manager and ecosystem" arch=('any') url="http://conda.pydata.org/docs/" license=('BSD') -groups=() depends=('python' 'python-pycosat>=0.6.1' 'python-requests' 'python-ruamel.yaml-hg') -makedepends=() optdepends=( 'python-conda-build: to use the conda build command' ) provides=('conda' 'activate' 'deactivate') -conflicts=() -replaces=() -backup=() +conflicts=('python-conda-git') options=(!emptydirs) -install= source=( https://github.com/$_pyname/$_pyname/archive/$pkgver.tar.gz ) @@ -27,7 +22,6 @@ sha512sums=('bc5c85fa0c6824e4e9ee29ad57331f0e342905be84ee450643644e4a71c3bb77b50 package() { cd "$srcdir/${_pyname}-$pkgver" - echo $pkgver > conda/.version python setup.py install --root="$pkgdir/" --optimize=1 install -Dm 644 shell/conda.fish $pkgdir/usr/share/fish/functions/conda.fish install -Dm 644 LICENSE.txt $pkgdir/usr/share/licenses/${pkgname}/LICENSE.txt diff --git a/activate.py.patch b/activate.py.patch deleted file mode 100644 index 4a8340e439c6..000000000000 --- a/activate.py.patch +++ /dev/null @@ -1,6 +0,0 @@ -134,135c134,135 -< if rootpath: -< path = path.replace(shelldict['pathsep'].join(rootpath), "") ---- -> #if rootpath: -> # path = path.replace(shelldict['pathsep'].join(rootpath), "") |