Include correct version of the manual

2 files changed, 13 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fea342cc919c..0b52f2aee177 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = qt-dab
 	pkgdesc = Software DAB decoder for use with various SDR devices (formerly dab-maxi)
 	pkgver = 6.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.sdr-j.tk/
 	arch = x86_64
 	license = GPL2
diff --git a/PKGBUILD b/PKGBUILD
index 38ab74922891..349fccb8ca72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,14 @@
 
 pkgname=qt-dab
 pkgver=6.1
-_prefix=qt-dab- # name of tarball and contents change from release to release
-_tagname=6.1 # tag names may combine v4 and v5
+pkgrel=2
+_prefix=qt-dab-  # name of tarball and contents change from release to release
+_tagname=$pkgver # tag names may differ from the application version
+_major=${pkgver::1}
 _pkgver=${_tagname//\//-}
-_fullname=${pkgname}-6
-_fullname_s=${pkgname}-s6
+_fullname=${pkgname}-${_major}
+_fullname_s=${pkgname}-s${_major}
 _binary=${pkgname}-${pkgver}
-pkgrel=1
 pkgdesc="Software DAB decoder for use with various SDR devices (formerly dab-maxi)"
 arch=(x86_64)
 url="https://www.sdr-j.tk/"
@@ -59,5 +60,10 @@ package() {
 	install -Dm 755 build/${_binary} "${pkgdir}"/usr/bin/${_fullname}
 	install -Dm 644 ${_prefix}${pkgname}-${_pkgver}/${_fullname_s}/${_fullname}.desktop "${pkgdir}"/usr/share/applications/${_fullname}.desktop
 	install -Dm 644 ${_prefix}${pkgname}-${_pkgver}/${_fullname_s}/${_fullname}.png "${pkgdir}"/usr/share/icons/hicolor/256x256/apps/${_fullname}.png
-	install -Dm 644 ${_prefix}${pkgname}-${_pkgver}/qt-dab.pdf "${pkgdir}"/usr/share/doc/${pkgname}/manual.pdf
+
+	if [ $_major -gt 4 ]; then
+		install -Dm 644 ${_prefix}${pkgname}-${_pkgver}/docs/manual-${_major}.pdf "${pkgdir}"/usr/share/doc/${pkgname}/manual.pdf
+	else
+		install -Dm 644 ${_prefix}${pkgname}-${_pkgver}/qt-dab.pdf "${pkgdir}"/usr/share/doc/${pkgname}/manual.pdf
+	fi
 }