diff options
| -rw-r--r-- | libre/h-client/PKGBUILD | 35 | ||||
| -rw-r--r-- | pcr/h-client/PKGBUILD | 44 | ||||
| -rw-r--r-- | pcr/h-client/h-client-fix_test.patch | 80 |
3 files changed, 124 insertions, 35 deletions
diff --git a/libre/h-client/PKGBUILD b/libre/h-client/PKGBUILD deleted file mode 100644 index 5e988d060..000000000 --- a/libre/h-client/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Maintainer: Michał Masłowski <mtjm@mtjm.eu> - -pkgname=h-client -_pkgver=0.0a0.dev-r129 -pkgver=${_pkgver/-/.} -pkgrel=1 -pkgdesc="A client for an h-source server (such as http://www.h-node.org/)" -arch=('any') -url="https://savannah.nongnu.org/projects/h-client/" -license=('GPL3') -depends=('python2' 'python2-distribute' 'python2-pycurl' 'pygtk') -options=(!emptydirs) -# Official source is in SVN, this is made by "python2 setup.py sdist" -# on a machine having Subversion 1.6.x (e.g. on Trisquel 4.0). -source=("https://mtjm.eu/releases/hclient-${_pkgver}.tar.gz"{,.sig}) -sha512sums=('e4f8f88db5cd27bb3304c1421bd661da9c52a15297d273cd6fa81ccfd0f1c9b210dc87373ecc6d414585c525a570c7f783d706fa67e247562fd8c7fa5e59a9e7' - '5712b41c4a4d45482e96825762955855212c3594b61624495e6ddec0b85a4718e080da1c99be22cb91aa644ee65d3708cc06b004f84b6facf2531b7b4c897c03') - -build() { - cd "$srcdir/hclient-${_pkgver}" - make -} - -check() { - cd "$srcdir/hclient-${_pkgver}" - python2 setup.py test -} - -package() { - cd "$srcdir/hclient-${_pkgver}" - python2 setup.py install --root="$pkgdir/" --optimize=1 - make DESTDIR="$pkgdir" prefix=/usr install-data -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/h-client/PKGBUILD b/pcr/h-client/PKGBUILD new file mode 100644 index 000000000..489aedb5c --- /dev/null +++ b/pcr/h-client/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: Michał Masłowski <mtjm@mtjm.eu> + +pkgname=h-client +pkgver=0.0a0.dev134 +pkgrel=1 +epoch=1 +pkgdesc="A client for an h-source server (such as https://www.h-node.org/)" +arch=('any') +url="https://savannah.nongnu.org/projects/h-client/" +license=('GPL3') +depends=('python2' 'python2-distribute' 'python2-pycurl' 'pygtk' 'pciutils' 'usbutils') +makedepends=('subversion') +options=(!emptydirs) +source=("svn+http://svn.savannah.nongnu.org/svn/${pkgname}/trunk/${pkgname}" + 'h-client-fix_test.patch') +sha256sums=('SKIP' + 'df842c88bb5bcf6a97db1e2ea813f7f968d9b2e8460a16a4359d62240eb44d1a') + +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" +} + +build() { + cd "$srcdir/${pkgname}" + make +} + +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 +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/h-client/h-client-fix_test.patch b/pcr/h-client/h-client-fix_test.patch new file mode 100644 index 000000000..930c7c35b --- /dev/null +++ b/pcr/h-client/h-client-fix_test.patch @@ -0,0 +1,80 @@ +--- h-client.orig/hclient/machine.py 2016-07-23 02:00:01.290465000 -0500 ++++ h-client/hclient/machine.py 2016-07-23 04:48:58.908039710 -0500 +@@ -72,7 +72,7 @@ + + + def parse_os_release(file_object): +- """Parse /etc/os-release into a dictionary.""" ++ """Parse /usr/lib/os-release into a dictionary.""" + data = {} + # See os-release(5) for specification of the format parsed. + for line in file_object: +@@ -89,7 +89,7 @@ + def distro_from_os_release(data): + """Return distro code as string for the specified dictionary of + os-release data.""" +- # TODO detect other distros if they have /etc/os-release. The ++ # TODO detect other distros if they have /usr/lib/os-release. The + # reason for not using the data directly is different distro + # naming in h-source. + if data.get("ID", "") == "parabola": +@@ -122,7 +122,7 @@ + An empty string is returned if the distro is not known. + """ + try: +- with opener.open("/etc/os-release") as os_release: ++ with opener.open("/usr/lib/os-release") as os_release: + release = distro_from_os_release(parse_os_release(os_release)) + except IOError: + 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.")) + + +-#: ``/etc/os-release`` from Parabola. ++#: ``/usr/lib/os-release`` from Parabola. + _PARABOLA_OS_RELEASE ="""NAME="Parabola" + ID=parabola + ID_LIKE=arch +@@ -73,7 +74,7 @@ + DISTRIB_RELEASE=rolling + DISTRIB_DESCRIPTION="Parabola GNU/Linux-libre" + """) +- elif file_name == "/etc/os-release": ++ elif file_name == "/usr/lib/os-release": + string = StringIO(_PARABOLA_OS_RELEASE) + elif file_name == "/etc/parabola-release": + string = StringIO("Parabola GNU/Linux-libre release\n") +@@ -87,7 +88,7 @@ + if pattern != "/etc/*-release": + raise NotImplemented("Unknown pattern %r" % pattern) + return ["/etc/arch-release", "/etc/lsb-release", +- "/etc/os-release", "/etc/parabola-release"] ++ "/usr/lib/os-release", "/etc/parabola-release"] + + + class _TaranisOpener(object): +@@ -177,14 +178,14 @@ + self.assertTrue(user_distribution()) + + def test_parse_os_release(self): +- """Check that Parabola /etc/os-release is correctly parsed.""" ++ """Check that Parabola /usr/lib/os-release is correctly parsed.""" + from hclient.machine import parse_os_release + from StringIO import StringIO + self.assertEquals(_PARABOLA_DATA, + parse_os_release(StringIO(_PARABOLA_OS_RELEASE))) + + def test_distro_from_os_release(self): +- """Check that Parabola is detected using /etc/os-release.""" ++ """Check that Parabola is detected using /usr/lib/os-release.""" + from hclient.machine import distro_from_os_release + self.assertEquals("parabola", distro_from_os_release(_PARABOLA_DATA)) + |