diff options
Diffstat (limited to 'pcr/h-client')
| -rw-r--r-- | pcr/h-client/PKGBUILD | 43 | ||||
| -rw-r--r-- | pcr/h-client/fix_test.patch (renamed from pcr/h-client/h-client-fix_test.patch) | 9 |
2 files changed, 29 insertions, 23 deletions
diff --git a/pcr/h-client/PKGBUILD b/pcr/h-client/PKGBUILD index 489aedb5c..f66b82363 100644 --- a/pcr/h-client/PKGBUILD +++ b/pcr/h-client/PKGBUILD @@ -1,9 +1,11 @@ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # Contributor: Michał Masłowski <mtjm@mtjm.eu> +# Contributor: bill-auger <bill-auger@programmer.net> + pkgname=h-client pkgver=0.0a0.dev134 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="A client for an h-source server (such as https://www.h-node.org/)" arch=('any') @@ -13,32 +15,41 @@ depends=('python2' 'python2-distribute' 'python2-pycurl' 'pygtk' 'pciutils' 'usb makedepends=('subversion') options=(!emptydirs) source=("svn+http://svn.savannah.nongnu.org/svn/${pkgname}/trunk/${pkgname}" - 'h-client-fix_test.patch') + 'fix_test.patch') sha256sums=('SKIP' - 'df842c88bb5bcf6a97db1e2ea813f7f968d9b2e8460a16a4359d62240eb44d1a') + 'f80a2a5971c091093c8ce4a8d963ace36383e7bd819b98c9c86846fb82db9e0d') + + +prepare() +{ + cd "${srcdir}"/${pkgname} -prepare() { - cd "$srcdir/${pkgname}" sed -i "s/dev/dev134/g" setup.cfg sed -i "s/tag_svn_revision = 1//g" setup.cfg sed -i "s/'h-node.org'/'https:\/\/h-node.org'/g" hclient/gtkclient.py - patch -Np1 -i "$srcdir/h-client-fix_test.patch" + + echo "applying fix_test.patch" + patch -Np1 -i "${srcdir}"/fix_test.patch } -build() { - cd "$srcdir/${pkgname}" +build() +{ + cd "${srcdir}"/${pkgname} + make } -check() { - cd "$srcdir/${pkgname}" +check() +{ + cd "${srcdir}"/${pkgname} + python2 setup.py test } -package() { - cd "$srcdir/${pkgname}" - python2 setup.py install --root="$pkgdir/" --optimize=1 - make DESTDIR="$pkgdir" prefix=/usr install-data -} +package() +{ + cd "${srcdir}"/${pkgname} -# vim:set ts=2 sw=2 et: + python2 setup.py install --root="${pkgdir}"/ --optimize=1 + make DESTDIR="${pkgdir}" prefix=/usr install-data +} diff --git a/pcr/h-client/h-client-fix_test.patch b/pcr/h-client/fix_test.patch index 930c7c35b..8ffbd50f9 100644 --- a/pcr/h-client/h-client-fix_test.patch +++ b/pcr/h-client/fix_test.patch @@ -29,13 +29,8 @@ pass # missing file, try other release files --- h-client.orig/tests_hclient/machine.py 2016-07-23 02:00:01.930436000 -0500 +++ h-client/tests_hclient/machine.py 2016-07-23 05:04:55.380405303 -0500 -@@ -34,10 +34,11 @@ - """Check that obtained kernel version looks like Linux version""" - from hclient.machine import KERNEL_VERSION - self.assertTrue(KERNEL_VERSION.startswith("2.6.") -- or KERNEL_VERSION.startswith("3.")) -+ or KERNEL_VERSION.startswith("3.") -+ or KERNEL_VERSION.startswith("4.")) +@@ -37,7 +37,7 @@ + self.assertTrue(re.match('^\d+\.\d+.*', KERNEL_VERSION)) -#: ``/etc/os-release`` from Parabola. |