Skip license checksum / replace infinality package

2 files changed, 7 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 083f8cb68ea3..07ce2b5ba2c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Jan 12 10:33:13 UTC 2017
+# Sun Jan 15 00:39:49 UTC 2017
 pkgbase = ttf-merriweather-sans
 	pkgdesc = A sans-serif typeface that is pleasant to read on screens by Sorkin Type Co
 	pkgver = 1.006
-	pkgrel = 1
+	pkgrel = 2
 	url = https://fonts.google.com/specimen/Merriweather+Sans
 	install = ttf-merriweather-sans.install
 	arch = any
@@ -13,6 +13,7 @@ pkgbase = ttf-merriweather-sans
 	depends = xorg-font-utils
 	conflicts = ttf-google-fonts-git
 	conflicts = ttf-google-fonts-opinionated-git
+	conflicts = ttf-merriweather-sans-ib
 	source = https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-Bold.ttf
 	source = https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-BoldItalic.ttf
 	source = https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-ExtraBold.ttf
@@ -30,7 +31,7 @@ pkgbase = ttf-merriweather-sans
 	sha256sums = 296f4c55d4df693b2ee8240184b2d8ff655c5f32944597f7733965dc76840d40
 	sha256sums = ff3b59fa8aca71e75e9aa329bf1e67bcf2fb4f5fa23edefba010c024941229f7
 	sha256sums = d8ca7e8e39b7e486d7545a0bbefdfe08dfd9b2ddaa672be07f48b16c46dbc24b
-	sha256sums = 22c4588bdc14621220ba14515d52041d1312541e034a15d1f5c2a88fc6075276
+	sha256sums = SKIP
 
 pkgname = ttf-merriweather-sans
 
diff --git a/PKGBUILD b/PKGBUILD
index 9f43743610c7..caf1aeb9f984 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
 
 pkgname=ttf-merriweather-sans
 pkgver=1.006
-pkgrel=1
+pkgrel=2
 pkgdesc='A sans-serif typeface that is pleasant to read on screens by Sorkin Type Co'
 arch=('any')
 url='https://fonts.google.com/specimen/Merriweather+Sans'
 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')
+conflicts=('ttf-google-fonts-git' 'ttf-google-fonts-opinionated-git' 'ttf-merriweather-sans-ib')
 install="${pkgname}.install"
 source=('https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-Bold.ttf'
         'https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-BoldItalic.ttf'
@@ -27,7 +27,7 @@ sha256sums=('9b17d0769b7f16eae06168007dfe129ca1be4e582d972949103daf9be393ba87'
             '296f4c55d4df693b2ee8240184b2d8ff655c5f32944597f7733965dc76840d40'
             'ff3b59fa8aca71e75e9aa329bf1e67bcf2fb4f5fa23edefba010c024941229f7'
             'd8ca7e8e39b7e486d7545a0bbefdfe08dfd9b2ddaa672be07f48b16c46dbc24b'
-            '22c4588bdc14621220ba14515d52041d1312541e034a15d1f5c2a88fc6075276')
+            'SKIP')
 
 package() {
   install -dm 755 "${pkgdir}/usr/share/fonts/TTF"