Click here to go back to the commit logs for bookworm.

Commit:

---

Hash: f6a6b84fdc9764ea1b7c0d5a7eff79b17d9c2ab6

Message: Updated conflicts

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index c448d1e..3b28f55 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,7 +3,8 @@ generated-by = makedeb-makepkg
 pkgbase = bookworm
 	pkgdesc = A simple and focused eBook reader
 	pkgver = 1.1.2
-	pkgrel = 2
+	pkgrel = 3
+	url = https://github.com/babluboy/bookworm
 	arch = any
 	makedepends = unzip
 	makedepends = poppler-utils
@@ -25,7 +26,9 @@ pkgbase = bookworm
 	makedepends = ninja-build
 	makedepends = appstream
 	makedepends = git
-	source = bookworm-1.1.2::git+https://github.com/babluboy/bookworm/#tag=1.1.2
+	conflicts = bookworm-git
+	conflicts = bookworm-bin
+	source = git+https://github.com/babluboy/bookworm.git#tag=1.1.2
 	sha256sums = SKIP
 
 pkgname = bookworm
diff --git a/PKGBUILD b/PKGBUILD
index e04ec90..a2f23e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,27 @@
 # Maintainer: hiddeninthesand <hiddeninthesand at pm dot me>
 
-#Contributor: Hunter Wittenborn <hunter@hunterwittenborn.com>
-pkgname=bookworm
-pkgver=1.1.2
-pkgrel=2
+# Contributor: Hunter Wittenborn <hunter@hunterwittenborn.com>
+pkgname="bookworm"
+_gitname="bookworm"
+pkgver="1.1.2"
+pkgrel="3"
 pkgdesc="A simple and focused eBook reader"
 arch=('any')
+url="https://github.com/babluboy/bookworm"
 makedepends=('unzip' 'poppler-utils' 'unar' 'html2text' 'python2.7' 'libgtk-3-dev' 'libgee-0.8-dev' 'libgranite-dev' 'libsqlite3-dev' 'libxml2-dev' 'webkit2gtk-4.0' 'libwebkit2gtk-4.0-37' 'libpoppler-glib-dev' 'meson' 'valac' 'gettext' 'curl' 'ninja-build' 'appstream' 'git')
 
-source=("${pkgname}-${pkgver}::git+https://github.com/babluboy/bookworm/#tag=${pkgver}")
+source=("git+${url}.git#tag=${pkgver}")
 sha256sums=('SKIP')
+conflicts=("${_gitname}-git" "${_gitname}-bin")
 
 build() {
-    cd "${pkgname}-${pkgver}/"
+    cd "${_gitname}"
     meson build --prefix=/usr
     cd build/
     ninja
 }
 
 package() {
-    cd "${pkgname}-${pkgver}/build/"
+    cd "${_gitname}/build"
     DESTDIR="${pkgdir}" ninja install
 }