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 b6dd274e6ad1..193aa663ace2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = chatty-beta
+pkgbase = chatty
pkgdesc = Twitch Chat Client for Desktop
pkgver = 0.9.7
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.9.7.tar.gz::https://github.com/chatty/chatty/archive/v0.9.7.tar.gz
source = chatty.desktop
source = chatty_script
@@ -21,5 +19,5 @@ pkgbase = chatty-beta
sha512sums = b5ea9a3e77cf5ed006537348371619577aabf86bdb4e90b249c2e3a236b1f1d51920c6af2d2779920a0853cb4f5456fc0a10ad2a788c7c1e5b2649f7f2b756d0
sha512sums = 8df69baaf9a0bad68d7c1aac96877b65637c4688d59f9b36f4915b77e2ec9bfa99c67adfe69bca95baee88a585f6f01f5f26eb076079f95bfca9f0ac19180199
-pkgname = chatty-beta
+pkgname = chatty
diff --git a/PKGBUILD b/PKGBUILD
index 1872aa3821eb..4c8fe0d37f90 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.9.7
-_pkgver=${pkgver//_/-}
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 @@ sha512sums=('a5efa34d3128548c2220b67d184b28037ff4e43634dfba47bd7f93c73c20d54c830
'8df69baaf9a0bad68d7c1aac96877b65637c4688d59f9b36f4915b77e2ec9bfa99c67adfe69bca95baee88a585f6f01f5f26eb076079f95bfca9f0ac19180199')
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"