diff options
author | bill-auger <mr.j.spam.me@gmail.com> | 2021-07-23 20:26:22 -0400 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2021-08-13 20:49:25 -0400 |
commit | a74132f8ee50b3d36574914f91e09e118706f5d5 (patch) | |
tree | 9f04597cfa4d815f8b99ff7361330ccadb305c8e | |
parent | 69b31b43b2144f309c82c5080c5da2b7683013af (diff) |
[h-client]: upgrade to v0.0.0pre (python3/GTK3)
-rw-r--r-- | pcr/h-client/PKGBUILD | 44 | ||||
-rw-r--r-- | pcr/h-client/fix_test.patch | 75 |
2 files changed, 15 insertions, 104 deletions
diff --git a/pcr/h-client/PKGBUILD b/pcr/h-client/PKGBUILD index f66b82363..c053d8480 100644 --- a/pcr/h-client/PKGBUILD +++ b/pcr/h-client/PKGBUILD @@ -4,52 +4,38 @@ pkgname=h-client -pkgver=0.0a0.dev134 -pkgrel=2 +pkgver=0.0.0pre1 +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') +pkgdesc="Client for h-source servers (such as h-node.org)" +arch=(any) +url=https://h-node.org/wiki/page/en/client-for-h-node-org +license=(GPL3) +depends=(pciutils python-distribute python-gobject python-pycurl usbutils) +makedepends=() options=(!emptydirs) -source=("svn+http://svn.savannah.nongnu.org/svn/${pkgname}/trunk/${pkgname}" - 'fix_test.patch') -sha256sums=('SKIP' - 'f80a2a5971c091093c8ce4a8d963ace36383e7bd819b98c9c86846fb82db9e0d') +source=(https://pagure.io/${pkgname}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz) +sha256sums=(bd6fbe806b00f0311803b6ee979f9b28877fa8432d1884848e72c650c4128de2) -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 - - echo "applying fix_test.patch" - patch -Np1 -i "${srcdir}"/fix_test.patch -} - build() { - cd "${srcdir}"/${pkgname} + cd "${srcdir}"/${pkgname}-${pkgver} make } check() { - cd "${srcdir}"/${pkgname} + cd "${srcdir}"/${pkgname}-${pkgver} - python2 setup.py test + python setup.py test } package() { - cd "${srcdir}"/${pkgname} + cd "${srcdir}"/${pkgname}-${pkgver} - python2 setup.py install --root="${pkgdir}"/ --optimize=1 + python setup.py install --root="${pkgdir}"/ --optimize=1 make DESTDIR="${pkgdir}" prefix=/usr install-data } diff --git a/pcr/h-client/fix_test.patch b/pcr/h-client/fix_test.patch deleted file mode 100644 index 8ffbd50f9..000000000 --- a/pcr/h-client/fix_test.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- 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 -@@ -37,7 +37,7 @@ - self.assertTrue(re.match('^\d+\.\d+.*', KERNEL_VERSION)) - - --#: ``/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)) - |