Proper build system

Temporarily use my fork.

2 files changed, 18 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef94ab9665e8..93194fdc1111 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,9 +2,10 @@ pkgbase = epubmerge
 	pkgdesc = A tool for merging multiple epub files into one.
 	pkgver = 2.18.0
 	pkgrel = 1
-	url = https://github.com/JimmXinu/EpubMerge
+	url = https://github.com/Spixmaster/EpubMerge
 	arch = any
 	license = GPL-3.0-or-later
+	makedepends = git
 	makedepends = python-build
 	makedepends = python-installer
 	depends = calibre
@@ -12,7 +13,7 @@ pkgbase = epubmerge
 	depends = python-pyqt5
 	depends = python-setuptools
 	depends = python-six
-	source = epubmerge-v2.18.0.tar.gz::https://github.com/JimmXinu/EpubMerge/archive/refs/tags/v2.18.0.tar.gz
-	sha512sums = ce0e9dcaa8e8d978442ae5a066ff7e4ca46bdb5fe7a71784151202688571a623dda12a83f17358a3133bbae430c9dfe2704caacbe32af2250b1513840cccec34
+	source = EpubMerge::git+https://github.com/Spixmaster/EpubMerge.git
+	sha512sums = SKIP
 
 pkgname = epubmerge
diff --git a/PKGBUILD b/PKGBUILD
index 12ae5ea559c8..6543e7fb711b 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,29 +12,33 @@ pkgver="2.18.0"
 pkgrel="1"
 pkgdesc="A tool for merging multiple epub files into one."
 arch=("any")
-url="https://github.com/JimmXinu/${_pkgname}"
+url="https://github.com/Spixmaster/${_pkgname}"
 license=("GPL-3.0-or-later")
 depends=("calibre" "python" "python-pyqt5" "python-setuptools" "python-six")
-makedepends=("python-build" "python-installer")
-source=("${pkgname}-v${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz")
-sha512sums=("ce0e9dcaa8e8d978442ae5a066ff7e4ca46bdb5fe7a71784151202688571a623dda12a83f17358a3133bbae430c9dfe2704caacbe32af2250b1513840cccec34")
+makedepends=("git" "python-build" "python-installer")
+#source=("${pkgname}-v${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz")
+source=("${_pkgname}::git+${url}.git")
+#sha512sums=("ce0e9dcaa8e8d978442ae5a066ff7e4ca46bdb5fe7a71784151202688571a623dda12a83f17358a3133bbae430c9dfe2704caacbe32af2250b1513840cccec34")
+sha512sums=("SKIP")
 
-prepare()
+build()
 {
-    chmod 755 "${srcdir}"/"${_pkgname}"-"${pkgver}"/epubmerge.py
+    # cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ || exit 1
+    cd "${srcdir}"/"${_pkgname}"/ || exit 1
+    python -m build -nw
 }
 
 package()
 {
     # Assure that the directories exist.
     mkdir -p "${pkgdir}"/usr/bin/
-    mkdir -p "${pkgdir}"/usr/lib/"${pkgname}"/
     mkdir -p "${pkgdir}"/usr/share/doc/"${pkgname}"/
 
     # Install the software.
-    cp -r "${srcdir}"/"${_pkgname}"-"${pkgver}"/* "${pkgdir}"/usr/lib/"${pkgname}"/
-    ln -s /usr/lib/"${pkgname}"/epubmerge.py "${pkgdir}"/usr/bin/epubmerge
+    # python -m installer -d "${pkgdir}" "${srcdir}"/"${pkgname}"-"${pkgver}"/dist/*.whl
+    python -m installer -d "${pkgdir}" "${srcdir}"/"${_pkgname}"/dist/*.whl
 
     # Install the documentation.
-    install -Dm644 "${srcdir}"/"${_pkgname}"-"${pkgver}"/README.md "${pkgdir}"/usr/share/doc/"${pkgname}"/
+    # install -Dm644 "${srcdir}"/"${_pkgname}"-"${pkgver}"/README.md "${pkgdir}"/usr/share/doc/"${pkgname}"/
+    install -Dm644 "${srcdir}"/"${_pkgname}"/README.md "${pkgdir}"/usr/share/doc/"${pkgname}"/
 }