Future-proof source files

2 files changed, 32 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 43854690ce53..599171f177a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Jan 24 18:30:18 UTC 2017
+# Wed Jan 25 23:58:03 UTC 2017
 pkgbase = ttf-merriweather
 	pkgdesc = A typeface that is pleasant to read on screens by Sorkin Type Co
 	pkgver = 2.000
-	pkgrel = 1
+	pkgrel = 2
 	url = https://fonts.google.com/specimen/Merriweather
 	install = ttf-merriweather.install
 	arch = any
@@ -14,15 +14,15 @@ pkgbase = ttf-merriweather
 	conflicts = ttf-google-fonts-git
 	conflicts = ttf-google-fonts-opinionated-git
 	conflicts = ttf-merriweather-ib
-	source = https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-Black.ttf
-	source = https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-BlackItalic.ttf
-	source = https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-Bold.ttf
-	source = https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-BoldItalic.ttf
-	source = https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-Italic.ttf
-	source = https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-Light.ttf
-	source = https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-LightItalic.ttf
-	source = https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-Regular.ttf
-	source = https://github.com/google/fonts/raw/master/ofl/merriweather/OFL.txt
+	source = Merriweather-Black-2.000.ttf::https://github.com/google/fonts/raw/9e05c7347870f8e27a4a293a0df006939c4ddda2/ofl/merriweather/Merriweather-Black.ttf
+	source = Merriweather-BlackItalic-2.000.ttf::https://github.com/google/fonts/raw/9e05c7347870f8e27a4a293a0df006939c4ddda2/ofl/merriweather/Merriweather-BlackItalic.ttf
+	source = Merriweather-Bold-2.000.ttf::https://github.com/google/fonts/raw/9e05c7347870f8e27a4a293a0df006939c4ddda2/ofl/merriweather/Merriweather-Bold.ttf
+	source = Merriweather-BoldItalic-2.000.ttf::https://github.com/google/fonts/raw/9e05c7347870f8e27a4a293a0df006939c4ddda2/ofl/merriweather/Merriweather-BoldItalic.ttf
+	source = Merriweather-Italic-2.000.ttf::https://github.com/google/fonts/raw/9e05c7347870f8e27a4a293a0df006939c4ddda2/ofl/merriweather/Merriweather-Italic.ttf
+	source = Merriweather-Light-2.000.ttf::https://github.com/google/fonts/raw/9e05c7347870f8e27a4a293a0df006939c4ddda2/ofl/merriweather/Merriweather-Light.ttf
+	source = Merriweather-LightItalic-2.000.ttf::https://github.com/google/fonts/raw/9e05c7347870f8e27a4a293a0df006939c4ddda2/ofl/merriweather/Merriweather-LightItalic.ttf
+	source = Merriweather-Regular-2.000.ttf::https://github.com/google/fonts/raw/9e05c7347870f8e27a4a293a0df006939c4ddda2/ofl/merriweather/Merriweather-Regular.ttf
+	source = ttf-merriweather-2.000-OFL.txt::https://github.com/google/fonts/raw/9e05c7347870f8e27a4a293a0df006939c4ddda2/ofl/merriweather/OFL.txt
 	sha256sums = 5350971f435ee4799fbd96e8d4208c177cf468f13e52a5bafabca8933890712b
 	sha256sums = c1b73033f0356ecd5362796b391a50c9683bd6bb826429e33b4288dee29636c6
 	sha256sums = 3b8c53954df2c0b0f47c417cb577423249da5f9cd21fd0e34e403ee0e6ec3eea
@@ -31,7 +31,7 @@ pkgbase = ttf-merriweather
 	sha256sums = 0ff2d78185d096bed3098a171f887b678caab9b143cd81f472c0074dd57a365f
 	sha256sums = 8321208fe77f710d3f7429ba5a7c4873bd9374a361ca8d758a9ff4869aa412c1
 	sha256sums = f593e9a01036386e34386e9dbec0824544e591569df649f19c9a8817f6227926
-	sha256sums = SKIP
+	sha256sums = a66f32f6cb05795b28fea487250d7616274178dcbb946ec198e9f8ef5b30cbc2
 
 pkgname = ttf-merriweather
 
diff --git a/PKGBUILD b/PKGBUILD
index 4dbd3d341fd5..db93ca0801b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=ttf-merriweather
 pkgver=2.000
-pkgrel=1
+pkgrel=2
 pkgdesc='A typeface that is pleasant to read on screens by Sorkin Type Co'
 arch=('any')
 url='https://fonts.google.com/specimen/Merriweather'
@@ -10,15 +10,15 @@ license=('custom:SIL Open Font License v1.1')
 depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
 conflicts=('ttf-google-fonts-git' 'ttf-google-fonts-opinionated-git' 'ttf-merriweather-ib')
 install="${pkgname}.install"
-source=('https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-Black.ttf'
-        'https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-BlackItalic.ttf'
-        'https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-Bold.ttf'
-        'https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-BoldItalic.ttf'
-        'https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-Italic.ttf'
-        'https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-Light.ttf'
-        'https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-LightItalic.ttf'
-        'https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-Regular.ttf'
-        'https://github.com/google/fonts/raw/master/ofl/merriweather/OFL.txt')
+source=("Merriweather-Black-${pkgver}.ttf::https://github.com/google/fonts/raw/9e05c7347870f8e27a4a293a0df006939c4ddda2/ofl/merriweather/Merriweather-Black.ttf"
+        "Merriweather-BlackItalic-${pkgver}.ttf::https://github.com/google/fonts/raw/9e05c7347870f8e27a4a293a0df006939c4ddda2/ofl/merriweather/Merriweather-BlackItalic.ttf"
+        "Merriweather-Bold-${pkgver}.ttf::https://github.com/google/fonts/raw/9e05c7347870f8e27a4a293a0df006939c4ddda2/ofl/merriweather/Merriweather-Bold.ttf"
+        "Merriweather-BoldItalic-${pkgver}.ttf::https://github.com/google/fonts/raw/9e05c7347870f8e27a4a293a0df006939c4ddda2/ofl/merriweather/Merriweather-BoldItalic.ttf"
+        "Merriweather-Italic-${pkgver}.ttf::https://github.com/google/fonts/raw/9e05c7347870f8e27a4a293a0df006939c4ddda2/ofl/merriweather/Merriweather-Italic.ttf"
+        "Merriweather-Light-${pkgver}.ttf::https://github.com/google/fonts/raw/9e05c7347870f8e27a4a293a0df006939c4ddda2/ofl/merriweather/Merriweather-Light.ttf"
+        "Merriweather-LightItalic-${pkgver}.ttf::https://github.com/google/fonts/raw/9e05c7347870f8e27a4a293a0df006939c4ddda2/ofl/merriweather/Merriweather-LightItalic.ttf"
+        "Merriweather-Regular-${pkgver}.ttf::https://github.com/google/fonts/raw/9e05c7347870f8e27a4a293a0df006939c4ddda2/ofl/merriweather/Merriweather-Regular.ttf"
+        "${pkgname}-${pkgver}-OFL.txt::https://github.com/google/fonts/raw/9e05c7347870f8e27a4a293a0df006939c4ddda2/ofl/merriweather/OFL.txt")
 sha256sums=('5350971f435ee4799fbd96e8d4208c177cf468f13e52a5bafabca8933890712b'
             'c1b73033f0356ecd5362796b391a50c9683bd6bb826429e33b4288dee29636c6'
             '3b8c53954df2c0b0f47c417cb577423249da5f9cd21fd0e34e403ee0e6ec3eea'
@@ -27,10 +27,17 @@ sha256sums=('5350971f435ee4799fbd96e8d4208c177cf468f13e52a5bafabca8933890712b'
             '0ff2d78185d096bed3098a171f887b678caab9b143cd81f472c0074dd57a365f'
             '8321208fe77f710d3f7429ba5a7c4873bd9374a361ca8d758a9ff4869aa412c1'
             'f593e9a01036386e34386e9dbec0824544e591569df649f19c9a8817f6227926'
-            'SKIP')
+            'a66f32f6cb05795b28fea487250d7616274178dcbb946ec198e9f8ef5b30cbc2')
 
 package() {
   install -dm 755 "${pkgdir}/usr/share/fonts/TTF"
-  install -m 644 *.ttf "${pkgdir}/usr/share/fonts/TTF/"
-  install -Dm644 *.txt "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
+  install -m 644 Merriweather-Black-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/Merriweather-Black.ttf"
+  install -m 644 Merriweather-BlackItalic-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/Merriweather-BlackItalic.ttf"
+  install -m 644 Merriweather-Bold-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/Merriweather-Bold.ttf"
+  install -m 644 Merriweather-BoldItalic-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/Merriweather-BoldItalic.ttf"
+  install -m 644 Merriweather-Italic-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/Merriweather-Italic.ttf"
+  install -m 644 Merriweather-Light-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/Merriweather-Light.ttf"
+  install -m 644 Merriweather-LightItalic-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/Merriweather-LightItalic.ttf"
+  install -m 644 Merriweather-Regular-${pkgver}.ttf "${pkgdir}/usr/share/fonts/TTF/Merriweather-Regular.ttf"
+  install -Dm644 ${pkgname}-${pkgver}-OFL.txt "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
 }