summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD17
2 files changed, 9 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d774e36ba1af..b19a3d27b170 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = chatty-beta
+pkgbase = chatty
pkgdesc = Twitch Chat Client for Desktop
pkgver = 0.15
pkgrel = 1
@@ -10,8 +10,6 @@ pkgbase = chatty-beta
depends = sh
optdepends = streamlink: for watching streams in a custom video player.
optdepends = livestreamer: for watching streams in a custom video player.
- provides = chatty
- conflicts = chatty
source = chatty-0.15.tar.gz::https://github.com/chatty/chatty/archive/v0.15.tar.gz
source = chatty.desktop
source = chatty_script
@@ -21,4 +19,4 @@ pkgbase = chatty-beta
b2sums = ad27872651f6481b52721b286f3b22b5dde3c9d3a9f3bdf155a361f5733d20c0bd97515d283f0d038e96903e91e62e363dbb57aee25e018a4e7f4aa014ec715b
b2sums = fa6495c018023f244a924c2a37eafde6f26c13e4664480ca2ffdb3d7e97ba644f78db42bd75649825966ff70a3cfb1a4e9eff41087c501528f964f32ed0defe5
-pkgname = chatty-beta
+pkgname = chatty
diff --git a/PKGBUILD b/PKGBUILD
index 5952fc76adf2..b04cf0f93435 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,8 @@
# Maintainer: Frederik “Freso” S. Olesen <archlinux@freso.dk>
# Contributor: Christoph Korn <christoph.korn at posteo dot de>
_pkgname=chatty
-pkgname=${_pkgname}-beta
+pkgname=${_pkgname}
pkgver=0.15
-_pkgver=${pkgver//b/-b}
pkgrel=1
pkgdesc='Twitch Chat Client for Desktop'
arch=('any')
@@ -13,9 +12,7 @@ depends=('java-environment' 'sh')
optdepends=('streamlink: for watching streams in a custom video player.'
'livestreamer: for watching streams in a custom video player.')
makedepends=('gradle')
-provides=("${_pkgname}")
-conflicts=("${_pkgname}")
-source=("${_pkgname}-${_pkgver}.tar.gz::https://github.com/chatty/${_pkgname}/archive/v${_pkgver}.tar.gz"
+source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/chatty/${_pkgname}/archive/v${pkgver}.tar.gz"
"${_pkgname}.desktop"
"${_pkgname}_script"
'disable_version_check.patch')
@@ -25,19 +22,19 @@ b2sums=('db0855fcb317d02a8b97adf82d49c6142f300c22748afa490e4fbddec385508ca0f4d6f
'fa6495c018023f244a924c2a37eafde6f26c13e4664480ca2ffdb3d7e97ba644f78db42bd75649825966ff70a3cfb1a4e9eff41087c501528f964f32ed0defe5')
prepare() {
- cd "${_pkgname}-${_pkgver}"
+ cd "${_pkgname}-${pkgver}"
patch -p1 -i '../disable_version_check.patch'
}
build() {
- cd "${_pkgname}-${_pkgver}"
+ cd "${_pkgname}-${pkgver}"
gradle --quiet build
gradle --quiet release
}
package(){
- mkdir "${srcdir}/Chatty_${_pkgver}" && cd "${srcdir}/Chatty_${_pkgver}"
- bsdcpio -i -m --make-directories < "../${_pkgname}-${_pkgver}/build/releases/Chatty_${_pkgver}.zip"
+ mkdir "${srcdir}/Chatty_${pkgver}" && cd "${srcdir}/Chatty_${pkgver}"
+ bsdcpio -i -m --make-directories < "../${_pkgname}-${pkgver}/build/releases/Chatty_${pkgver}.zip"
install -Dm644 'Chatty.jar' "${pkgdir}/usr/share/${_pkgname}/Chatty.jar"
cp -a 'img' 'sounds' "${pkgdir}/usr/share/${_pkgname}/"
install -Dm644 'readme.txt' "${pkgdir}/usr/share/doc/${_pkgname}/readme.txt"
@@ -46,7 +43,7 @@ package(){
install -Dm755 "${_pkgname}_script" "${pkgdir}/usr/bin/${_pkgname}"
install -Dm644 "${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
- cd "${srcdir}/${_pkgname}-${_pkgver}"
+ cd "${srcdir}/${_pkgname}-${pkgver}"
install -Dm644 "./src/chatty/gui/app_main_16.png" "${pkgdir}/usr/share/icons/hicolor/16x16/apps/${_pkgname}.png"
install -Dm644 "./src/chatty/gui/app_main_64.png" "${pkgdir}/usr/share/icons/hicolor/64x64/apps/${_pkgname}.png"
install -Dm644 "./src/chatty/gui/app_main_128.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/${_pkgname}.png"