adopt pkg and suggested changes

Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>

4 files changed, 32 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb4ed06421fd..b09468c589b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 pkgbase = amdgpu-fan
 	pkgdesc = Python daemon for controlling the fans on AMDGPU cards
 	pkgver = 0.1.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/zzkW35/amdgpu-fan
 	arch = any
 	license = GPL2
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-setuptools
+	makedepends = python-wheel
 	depends = python
-	depends = python-yaml
 	depends = python-numpy
-	source = amdgpu-fan-0.1.0.tar.gz::https://github.com/zzkW35/amdgpu-fan/archive/0.1.0.tar.gz
-	md5sums = SKIP
+	depends = python-yaml
+	source = https://github.com/zzkW35/amdgpu-fan/archive/0.1.0.tar.gz
+	sha256sums = f2c1546aede4559d99f870531b317d0c2726013ae9dbf2ec4298f1e92c9684a4
 
 pkgname = amdgpu-fan
-
diff --git a/PKGBUILD b/PKGBUILD
index 29762f7cce03..17b4cbb6f3e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,36 @@
-# Maintainer: Eric Cheng <ericcheng@hey.com>
-# Maintainer: Filippo Roggi <zzkw35@gmail.com>
+# Maintainer: Oleksandr Natalenko <oleksandr@natalenko.name>
+# Contributor: Eric Cheng <ericcheng@hey.com>
+# Contributor: Filippo Roggi <zzkw35@gmail.com>
 # Contributor: Max Chesterfield <`echo Y2hlc3RtMDA3QGhvdG1haWwuY29tCg== | base64 -d`>
 
 pkgname=amdgpu-fan
 pkgdesc="Python daemon for controlling the fans on AMDGPU cards"
 pkgver=0.1.0
-pkgrel=3
-arch=('any')
-license=('GPL2')
-depends=('python' 'python-yaml' 'python-numpy')
-makedepends=('python-setuptools')
+pkgrel=4
+arch=(any)
+license=(GPL2)
+depends=(python python-numpy python-yaml)
+makedepends=(python-build python-installer python-setuptools python-wheel)
 url="https://github.com/zzkW35/amdgpu-fan"
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/zzkW35/amdgpu-fan/archive/${pkgver}.tar.gz")
-md5sums=('SKIP')
+source=(${url}/archive/${pkgver}.tar.gz)
+sha256sums=('f2c1546aede4559d99f870531b317d0c2726013ae9dbf2ec4298f1e92c9684a4')
+
+prepare() {
+	cd ${pkgname}-${pkgver}
+
+	sed -i "s/PROJECTVERSION/${pkgver}/g" setup.py
+}
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i "s/PROJECTVERSION/$pkgver/g" setup.py
-  python setup.py build
+	cd ${pkgname}-${pkgver}
+
+	python -m build --wheel --no-isolation
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i "s/PROJECTVERSION/$pkgver/g" setup.py
-  python setup.py install --prefix=/usr --root="$pkgdir"
-  mkdir -p "$pkgdir/usr/lib/systemd/system"
-  install -Dm644 amdgpu-fan.service "$pkgdir/usr/lib/systemd/system/"
-} 
\ No newline at end of file
+	cd ${pkgname}-${pkgver}
+
+	python -m installer --destdir="${pkgdir}" dist/*.whl
+
+	install -Dt "${pkgdir}"/usr/lib/systemd/system -m 0644 amdgpu-fan.service
+}
diff --git a/amdgpu-fan.service b/amdgpu-fan.service
deleted file mode 100644
index 35469b293eea..000000000000
--- a/amdgpu-fan.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=AMDGPU fan controller
-
-[Service]
-ExecStart=/usr/bin/amdgpu-fan
-Restart=always
-
-[Install]
-WantedBy=sysinit.target
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 9ae478cbea6a..000000000000
--- a/setup.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from distutils.core import setup
-
-from setuptools import find_packages
-
-with open('README.md') as f:
-    readme = f.read()
-
-
-setup(
-    name='amdgpu_fan',
-    version='PROJECTVERSION',
-    packages=find_packages(),
-    url='https://github.com/chestm007/amdgpu-fan',
-    license='GPL-2.0',
-    author='Max Chesterfield',
-    author_email='chestm007@hotmail.com',
-    maintainer='Filippo Roggi',
-    maintainer_email='zzkw35@gmail.com',
-    description='amdgpu fan controller',
-    long_description=readme,
-    install_requires=[
-        'pyyaml',
-        'numpy',
-    ],
-    entry_points="""
-        [console_scripts]
-        amdgpu-fan=amdgpu_fan.controller:main
-    """,
-)