Some fixes

2 files changed, 37 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fddcedb7a2b7..a5b4ec9a1ca3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,10 +2,13 @@ pkgbase = rare
 	pkgdesc = A GUI for legendary, an open source replacement for Epic Games Launcher
 	pkgver = 1.10.6
 	pkgrel = 1
-	url = https://github.com/Dummerle/Rare
+	url = https://github.com/RareDevs/Rare
 	arch = any
 	license = GPL3
 	makedepends = git
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-wheel
 	makedepends = python-setuptools
 	depends = python-pyqt5
 	depends = qt5-svg
@@ -13,11 +16,11 @@ pkgbase = rare
 	depends = python-requests
 	depends = python-typing_extensions
 	depends = legendary
-	optdepends = wine-staging: Run windows games
-	optdepends = python-pypresence: Use Discord RPC
-	optdepends = python-pywebview: easier login process in a browser
-	conflicts = rare-git
-	source = rare-1.10.6::git+https://github.com/Dummerle/Rare#tag=1.10.6
+	optdepends = wine: run Windows games
+	optdepends = proton: run Windows games
+	optdepends = python-pypresence: Discord RPC integration
+	optdepends = python-pywebview: embedded browser for logging in
+	source = git+https://github.com/RareDevs/Rare.git#tag=1.10.6
 	sha256sums = SKIP
 
 pkgname = rare
diff --git a/PKGBUILD b/PKGBUILD
index bebe8db4a18e..2462184681b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,42 @@
+# Maintainer: Dummerle
 
-# Maintaner: Dummerle
 pkgname=rare
 pkgver=1.10.6
 pkgrel=1
 pkgdesc="A GUI for legendary, an open source replacement for Epic Games Launcher"
 arch=('any')
-url="https://github.com/Dummerle/Rare"
+url="https://github.com/RareDevs/Rare"
 license=('GPL3')
-groups=()
-depends=("python-pyqt5" "qt5-svg" "python-qtawesome" "python-requests" "python-typing_extensions" "legendary")
-makedepends=("git" "python-setuptools")
-checkdepends=()
-optdepends=("wine-staging: Run windows games" "python-pypresence: Use Discord RPC " "python-pywebview: easier login process in a browser")
-provides=()
-conflicts=("rare-git")
-replaces=()
-backup=()
-options=()
-install=
-changelog=
-source=("$pkgname-$pkgver::git+$url#tag=$pkgver")
-noextract=()
+depends=(
+  python-pyqt5
+  qt5-svg
+  python-qtawesome
+  python-requests
+  python-typing_extensions
+  legendary
+)
+makedepends=(
+  git
+  python-{build,installer,wheel}
+  python-setuptools
+)
+optdepends=(
+  "wine: run Windows games"
+  "proton: run Windows games"
+  "python-pypresence: Discord RPC integration"
+  "python-pywebview: embedded browser for logging in"
+)
+source=("git+https://github.com/RareDevs/Rare.git#tag=$pkgver")
 sha256sums=("SKIP")
 
-prepare() {
-      cd $srcdir/$pkgname-$pkgver
-      cp $srcdir/$pkgname-$pkgver/rare/resources/images/Rare.png $srcdir/$pkgname-$pkgver/$pkgname.png
-}
-
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	python3 setup.py build
+  cd Rare
+  python -m build -wn
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	python setup.py install --root="$pkgdir/" --prefix=/usr --optimize=1 --skip-build
-	install -Dm644 "misc/${pkgname}.desktop" "$pkgdir/usr/share/applications/${pkgname}.desktop"
-	install -Dm644 "${pkgname}.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  cd Rare
+  python -m installer -d "$pkgdir" dist/*.whl
+  install -Dm644 "misc/${pkgname%-git}.desktop" "$pkgdir/usr/share/applications/${pkgname%-git}.desktop"
+  install -Dm644 "rare/resources/images/Rare.png" "$pkgdir/usr/share/pixmaps/${pkgname%-git}.png"
 }
-
-