summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD38
2 files changed, 28 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ab0a83493df6..f447da652a0a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,25 @@
pkgbase = montserrat-font
pkgdesc = Geometric font with Cyrillic and extended Latin support by Julieta Ulanovsky
- pkgver = 7.210
+ pkgver = 7.222
pkgrel = 1
url = https://github.com/JulietaUla/Montserrat
arch = any
license = OFL
- source = https://github.com/JulietaUla/Montserrat/archive/v7.210.tar.gz
- sha256sums = 2099ea2d57d5915657ea1c0d4066014ed5fc1a6f8bd87ba5aac2d4a6b4fc54bb
+ source = Montserrat-7.222.tar.gz::https://github.com/JulietaUla/Montserrat/archive/v7.222.tar.gz
+ sha256sums = 3adac1da44046c08179560fb0b11ec3607aea3a2dc591c5829a7acdcccab1c74
-pkgname = montserrat-font-otf
+pkgname = montserrat-otf
provides = montserrat-font
provides = otf-montserrat
+ provides = montserrat-font-otf
conflicts = otf-montserrat
replaces = otf-montserrat
+ replaces = montserrat-font-otf
-pkgname = montserrat-font-ttf
+pkgname = montserrat-ttf
provides = montserrat-font
provides = ttf-montserrat
+ provides = montserrat-font-ttf
conflicts = ttf-montserrat
replaces = ttf-montserrat
-
+ replaces = montserrat-font-ttf
diff --git a/PKGBUILD b/PKGBUILD
index 258050547f3a..6718ced2c0e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,34 +4,34 @@
pkgbase=montserrat-font
_pkgbase=${pkgbase%-font}
-pkgname=("$pkgbase-otf" "$pkgbase-ttf")
-pkgver=7.210
+pkgname=("$_pkgbase-otf" "$_pkgbase-ttf")
+pkgver=7.222
pkgrel=1
pkgdesc='Geometric font with Cyrillic and extended Latin support by Julieta Ulanovsky'
url="https://github.com/JulietaUla/${_pkgbase^}"
-arch=('any')
-license=('OFL')
-source=("https://github.com/JulietaUla/${_pkgbase^}/archive/v$pkgver.tar.gz")
-sha256sums=('2099ea2d57d5915657ea1c0d4066014ed5fc1a6f8bd87ba5aac2d4a6b4fc54bb')
+arch=(any)
+license=(OFL)
+_archive="${_pkgbase^}-$pkgver"
+source=("$_archive.tar.gz::https://github.com/JulietaUla/${_pkgbase^}/archive/v$pkgver.tar.gz")
+sha256sums=('3adac1da44046c08179560fb0b11ec3607aea3a2dc591c5829a7acdcccab1c74')
_package_helper() {
- install -Dm644 -t "$pkgdir/usr/share/fonts/${1^^}/" fonts/$1/${_pkgbase^}*.$1
- install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" OFL.txt AUTHORS.txt CONTRIBUTORS.txt
- install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname/" README.md DESCRIPTION.en_us.html
+ cd "$_archive"
+ install -Dm0644 -t "$pkgdir/usr/share/fonts/${1^^}/" fonts/$1/${_pkgbase^}*.$1
+ install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" OFL.txt AUTHORS.txt CONTRIBUTORS.txt
+ install -Dm0644 -t "$pkgdir/usr/share/doc/$pkgname/" README.md DESCRIPTION.en_us.html
}
-package_montserrat-font-otf() {
- replaces=('otf-montserrat')
- provides=("$pkgbase" 'otf-montserrat')
- conflicts=('otf-montserrat')
- cd "${_pkgbase^}-$pkgver"
+package_montserrat-otf() {
+ replaces=(otf-montserrat montserrat-font-otf)
+ provides=("$pkgbase" otf-montserrat montserrat-font-otf)
+ conflicts=(otf-montserrat)
_package_helper otf
}
-package_montserrat-font-ttf() {
- replaces=('ttf-montserrat')
- provides=("$pkgbase" 'ttf-montserrat')
- conflicts=('ttf-montserrat')
- cd "${_pkgbase^}-$pkgver"
+package_montserrat-ttf() {
+ replaces=(ttf-montserrat montserrat-font-ttf)
+ provides=("$pkgbase" ttf-montserrat montserrat-font-ttf)
+ conflicts=(ttf-montserrat)
_package_helper ttf
}