summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO28
-rw-r--r--PKGBUILD30
2 files changed, 13 insertions, 45 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e150ca8a6c57..f015db3ea3d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sun Dec 10 06:18:10 UTC 2017
pkgbase = crush
pkgdesc = Library to control placement in a hierarchy.
pkgver = 1.0.35
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/ceph/python-crush
arch = any
license = GPL
@@ -11,17 +9,10 @@ pkgbase = crush
makedepends = python-setuptools
makedepends = python-d2to1
makedepends = python-pbr
- makedepends = python2
- makedepends = python2-setuptools
- makedepends = python2-d2to1
- makedepends = python2-pbr
makedepends = cmake
makedepends = python-sphinx
makedepends = python-mock
- source = https://files.pythonhosted.org/packages/source/c/crush/crush-1.0.35.tar.gz
- sha256sums = a0cfb6166965a9cf19d479a14a2909e02af67775772773eb91ab3089b8e2e759
-
-pkgname = python-crush
+ makedepends = libatomic_ops
depends = python-d2to1
depends = python-numpy
depends = python-pandas
@@ -32,16 +23,7 @@ pkgname = python-crush
depends = python-six
depends = python-appdirs
depends = python-packaging
+ source = https://files.pythonhosted.org/packages/source/c/crush/crush-1.0.35.tar.gz
+ sha256sums = a0cfb6166965a9cf19d479a14a2909e02af67775772773eb91ab3089b8e2e759
-pkgname = python2-crush
- depends = python2-d2to1
- depends = python2-numpy
- depends = python2-pandas
- depends = python2-pbr
- depends = python2-pyparsing
- depends = python2-dateutil
- depends = python2-pytz
- depends = python2-six
- depends = python2-appdirs
- depends = python2-packaging
-
+pkgname = python-crush
diff --git a/PKGBUILD b/PKGBUILD
index a38ec81f140f..52c8e6fed31f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,17 @@
# Contributor: Konstantin Shalygin <k0ste@k0ste.ru>
pkgbase='crush'
-pkgname=("python-${pkgbase}" "python2-${pkgbase}")
+pkgname=("python-${pkgbase}")
pkgver='1.0.35'
-pkgrel='1'
+pkgrel='2'
pkgdesc='Library to control placement in a hierarchy.'
arch=('any')
url="https://github.com/ceph/python-${pkgbase}"
-makedepends=( 'python' 'python-setuptools' 'python-d2to1' 'python-pbr'
- 'python2' 'python2-setuptools' 'python2-d2to1' 'python2-pbr'
- 'cmake' 'python-sphinx' 'python-mock')
+makedepends=('python' 'python-setuptools' 'python-d2to1'
+ 'python-pbr' 'cmake' 'python-sphinx' 'python-mock' 'libatomic_ops')
+depends=('python-d2to1' 'python-numpy' 'python-pandas' 'python-pbr'
+ 'python-pyparsing' 'python-dateutil' 'python-pytz' 'python-six'
+ 'python-appdirs' 'python-packaging')
license=('GPL')
source=("https://files.pythonhosted.org/packages/source/c/${pkgbase}/${pkgbase}-${pkgver}.tar.gz")
sha256sums=('a0cfb6166965a9cf19d479a14a2909e02af67775772773eb91ab3089b8e2e759')
@@ -28,26 +30,10 @@ build() {
python setup.py build_sphinx
}
-package_python-crush() {
- depends=('python-d2to1' 'python-numpy' 'python-pandas' 'python-pbr'
- 'python-pyparsing' 'python-dateutil' 'python-pytz' 'python-six'
- 'python-appdirs' 'python-packaging')
-
+package() {
cd "${srcdir}/${pkgbase}-${pkgver}"
python setup.py install -O1 --root="${pkgdir}"
mkdir -p "${pkgdir}/usr/share/doc/python-${pkgbase}"
cp -ax "build/html/"* "${pkgdir}/usr/share/doc/python-${pkgbase}"
}
-
-package_python2-crush() {
- depends=('python2-d2to1' 'python2-numpy' 'python2-pandas' 'python2-pbr'
- 'python2-pyparsing' 'python2-dateutil' 'python2-pytz' 'python2-six'
- 'python2-appdirs' 'python2-packaging')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- python2 setup.py install -O1 --root="${pkgdir}"
-
- mkdir -p "${pkgdir}/usr/share/doc/python2-${pkgbase}"
- cp -ax "build/html/"* "${pkgdir}/usr/share/doc/python2-${pkgbase}"
-}