Turn into split package, cleanup, adopt

Downloading individual files is slow → let’s download the whole repo!
If we download the entire repo, we might aswell package the other fonts.

- Dependencies are not needed, see
  https://wiki.archlinux.org/index.php/Font_package_guidelines
- Custom licenses must be installed

3 files changed, 53 insertions, 89 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c444cfaa184c..a8eab4becd9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,40 +1,24 @@
-pkgbase = ttf-spectral
-	pkgdesc = Spectral is a new and versatile serif face
+pkgbase = spectral-font
+	pkgdesc = Screen-first serif font face
 	pkgver = 2.003
-	pkgrel = 2
+	pkgrel = 3
 	url = https://fonts.google.com/specimen/Spectral
 	arch = any
-	license = Open Font License
-	depends = fontconfig
-	depends = xorg-fonts-encodings
-	source = https://github.com/productiontype/Spectral/raw/748733e3761fc7985ca9c473996ed121954debf8/fonts/desktop/Spectral-LightItalic.ttf
-	source = https://github.com/productiontype/Spectral/raw/748733e3761fc7985ca9c473996ed121954debf8/fonts/desktop/Spectral-ExtraLightItalic.ttf
-	source = https://github.com/productiontype/Spectral/raw/748733e3761fc7985ca9c473996ed121954debf8/fonts/desktop/Spectral-ExtraLight.ttf
-	source = https://github.com/productiontype/Spectral/raw/748733e3761fc7985ca9c473996ed121954debf8/fonts/desktop/Spectral-ExtraBoldItalic.ttf
-	source = https://github.com/productiontype/Spectral/raw/748733e3761fc7985ca9c473996ed121954debf8/fonts/desktop/Spectral-Regular.ttf
-	source = https://github.com/productiontype/Spectral/raw/748733e3761fc7985ca9c473996ed121954debf8/fonts/desktop/Spectral-SemiBold.ttf
-	source = https://github.com/productiontype/Spectral/raw/748733e3761fc7985ca9c473996ed121954debf8/fonts/desktop/Spectral-Bold.ttf
-	source = https://github.com/productiontype/Spectral/raw/748733e3761fc7985ca9c473996ed121954debf8/fonts/desktop/Spectral-Medium.ttf
-	source = https://github.com/productiontype/Spectral/raw/748733e3761fc7985ca9c473996ed121954debf8/fonts/desktop/Spectral-BoldItalic.ttf
-	source = https://github.com/productiontype/Spectral/raw/748733e3761fc7985ca9c473996ed121954debf8/fonts/desktop/Spectral-MediumItalic.ttf
-	source = https://github.com/productiontype/Spectral/raw/748733e3761fc7985ca9c473996ed121954debf8/fonts/desktop/Spectral-Italic.ttf
-	source = https://github.com/productiontype/Spectral/raw/748733e3761fc7985ca9c473996ed121954debf8/fonts/desktop/Spectral-ExtraBold.ttf
-	source = https://github.com/productiontype/Spectral/raw/748733e3761fc7985ca9c473996ed121954debf8/fonts/desktop/Spectral-SemiBoldItalic.ttf
-	source = https://github.com/productiontype/Spectral/raw/748733e3761fc7985ca9c473996ed121954debf8/fonts/desktop/Spectral-Light.ttf
-	sha256sums = 12543d21160dcf35625c424f5cff9c4d37bb3470822ee2e4324f6d48bc84d3d2
-	sha256sums = 20800f30b95f771ffc9bd15fafe4bfb4e6bec71960d1093c01ed3d746fa7e28c
-	sha256sums = 26b1f7ca61d1ef84aad506c4cef7655f348e60305d894e96602715be7d1ee8f4
-	sha256sums = 27960c9b1de098fe1b2607a538dc41e7bd0deeb47fa5f9b567de962a8b412847
-	sha256sums = 5b5dd7bdac375813024c11b88b4150f4a78f4932fffc36b89ec3fe5adafe59cf
-	sha256sums = 606c0db13e006150bef5a9ed028158a36096231d0d669d3198ce1e60741ea679
-	sha256sums = 674e04166857f66d08f59f9005786b921559ec827f5cd9c261b9302f9ca03fb8
-	sha256sums = 7362eb2caf4dfb76fce254ccd3888f8e20245e3b3c0f49c472c14d42c4aa37cf
-	sha256sums = 7c95aff02781d1041650023b5b085f515e83f48b6d7dd55db487bf18968f1f2d
-	sha256sums = 7d5c306de88aaa3dab80579d05b2971a934b8533999e89491f9ca5c0d5b09963
-	sha256sums = 8732e739ac13bf843aaeaed5386192c08b8a5ae10b8112147569862fcdaecebd
-	sha256sums = 8d3b2570b49173801e003ff93b3bb4d33db1c73e6a34bdce12907414c01cbd20
-	sha256sums = 8f25bc122366feed8d04d3e7c99fd255390a63931393de7028680e6865ae8f64
-	sha256sums = f4ef08fca88e2be3c35b82fc2d17a806a77dd5214eff58e8bc55ca1aa19910ca
+	license = OFL
+	source = https://github.com/productiontype/Spectral/archive/748733e3761fc7985ca9c473996ed121954debf8/spectral-font-2.003.zip
+	sha256sums = 67cd3d1719b0650d8adac5115908882cc63f2ce964ff0fddbf6ec574b933b5b2
 
 pkgname = ttf-spectral
+	conflicts = otf-spectral
+
+pkgname = otf-spectral
+	conflicts = ttf-spectral
+
+pkgname = ttf-spectralsc
+	pkgdesc = Screen-first serif font face (small caps)
+	conflicts = otf-spectralsc
+
+pkgname = otf-spectralsc
+	pkgdesc = Screen-first serif font face (small caps)
+	conflicts = ttf-spectralsc
 
diff --git a/.gitignore b/.gitignore
index 4ad371c9140f..9f1a04d89345 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,3 @@
-Spectral-Bold.ttf
-Spectral-BoldItalic.ttf
-Spectral-ExtraBold.ttf
-Spectral-ExtraBoldItalic.ttf
-Spectral-ExtraLight.ttf
-Spectral-ExtraLightItalic.ttf
-Spectral-Italic.ttf
-Spectral-Light.ttf
-Spectral-LightItalic.ttf
-Spectral-Medium.ttf
-Spectral-MediumItalic.ttf
-Spectral-Regular.ttf
-Spectral-SemiBold.ttf
-Spectral-SemiBoldItalic.ttf
 pkg/
 src/
-ttf-spectral-*
+*.pkg.*
diff --git a/PKGBUILD b/PKGBUILD
index 478d3fcc0e2c..0ac01e57b342 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,44 @@
-# Maintainer: Dmitry <dmitry@ykkz.de>
+# Maintainer: Lennard Hofmann <lennard dot hofmann at web dot de>
+# Contributor: Dmitry <dmitry@ykkz.de>
 
-pkgname=ttf-spectral
+pkgname=(ttf-spectral otf-spectral ttf-spectralsc otf-spectralsc)
+pkgbase=spectral-font
 pkgver=2.003
-pkgrel=2
-pkgdesc='Spectral is a new and versatile serif face'
+pkgrel=3
+pkgdesc='Screen-first serif font face'
 arch=('any')
 url='https://fonts.google.com/specimen/Spectral'
-license=('Open Font License')
-depends=('fontconfig' 'xorg-fonts-encodings')
+license=('OFL')
 
+_reponame=Spectral
 _commit='748733e3761fc7985ca9c473996ed121954debf8'
-_raw="https://github.com/productiontype/Spectral/raw/${_commit}/fonts/desktop"
+source=("https://github.com/productiontype/$_reponame/archive/$_commit/$pkgbase-$pkgver.zip")
+sha256sums=('67cd3d1719b0650d8adac5115908882cc63f2ce964ff0fddbf6ec574b933b5b2')
 
-source=(
-        "${_raw}/Spectral-LightItalic.ttf"
-        "${_raw}/Spectral-ExtraLightItalic.ttf"
-        "${_raw}/Spectral-ExtraLight.ttf"
-        "${_raw}/Spectral-ExtraBoldItalic.ttf"
-        "${_raw}/Spectral-Regular.ttf"
-        "${_raw}/Spectral-SemiBold.ttf"
-        "${_raw}/Spectral-Bold.ttf"
-        "${_raw}/Spectral-Medium.ttf"
-        "${_raw}/Spectral-BoldItalic.ttf"
-        "${_raw}/Spectral-MediumItalic.ttf"
-        "${_raw}/Spectral-Italic.ttf"
-        "${_raw}/Spectral-ExtraBold.ttf"
-        "${_raw}/Spectral-SemiBoldItalic.ttf"
-        "${_raw}/Spectral-Light.ttf"
-        )
+_package() {
+	cd $srcdir/$_reponame-$_commit
+	install -Dm644 fonts/$1/* -t "$pkgdir/usr/share/fonts/$pkgname/"
+	install -Dm644 ofl.txt    -t "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+package_ttf-spectral() {
+	conflicts=(otf-spectral)
+	_package desktop
+}
 
-sha256sums=('12543d21160dcf35625c424f5cff9c4d37bb3470822ee2e4324f6d48bc84d3d2'
-            '20800f30b95f771ffc9bd15fafe4bfb4e6bec71960d1093c01ed3d746fa7e28c'
-            '26b1f7ca61d1ef84aad506c4cef7655f348e60305d894e96602715be7d1ee8f4'
-            '27960c9b1de098fe1b2607a538dc41e7bd0deeb47fa5f9b567de962a8b412847'
-            '5b5dd7bdac375813024c11b88b4150f4a78f4932fffc36b89ec3fe5adafe59cf'
-            '606c0db13e006150bef5a9ed028158a36096231d0d669d3198ce1e60741ea679'
-            '674e04166857f66d08f59f9005786b921559ec827f5cd9c261b9302f9ca03fb8'
-            '7362eb2caf4dfb76fce254ccd3888f8e20245e3b3c0f49c472c14d42c4aa37cf'
-            '7c95aff02781d1041650023b5b085f515e83f48b6d7dd55db487bf18968f1f2d'
-            '7d5c306de88aaa3dab80579d05b2971a934b8533999e89491f9ca5c0d5b09963'
-            '8732e739ac13bf843aaeaed5386192c08b8a5ae10b8112147569862fcdaecebd'
-            '8d3b2570b49173801e003ff93b3bb4d33db1c73e6a34bdce12907414c01cbd20'
-            '8f25bc122366feed8d04d3e7c99fd255390a63931393de7028680e6865ae8f64'
-            'f4ef08fca88e2be3c35b82fc2d17a806a77dd5214eff58e8bc55ca1aa19910ca')
+package_otf-spectral() {
+	conflicts=(ttf-spectral)
+	_package desktop_otf
+}
+
+package_ttf-spectralsc() {
+	conflicts=(otf-spectralsc)
+	pkgdesc+=' (small caps)'
+	_package sc
+}
 
-package() {
-  install -dm 755 "${pkgdir}/usr/share/fonts/TTF"
-  install -m 644 *.ttf "${pkgdir}/usr/share/fonts/TTF/"
+package_otf-spectralsc() {
+	conflicts=(ttf-spectralsc)
+	pkgdesc+=' (small caps)'
+	_package sc_otf
 }